Move //{chromeos=>ash}/services/chromebox_for_meetings

This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Change-Id: I35c16feb46fa4e6376f193a2347d511c6caf5d1a Bug: 1164001 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3528336 Reviewed-by: Kyle Williams <kdgwill@chromium.org> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Owners-Override: Hidehiko Abe <hidehiko@chromium.org> Commit-Queue: Yeunjoo Choi <ychoi@igalia.com> Cr-Commit-Position: refs/heads/main@{#984782}
chromium · Mar 24, 2022 · 07bad93 · 07bad93
1 parent dd5baa4
commit 07bad93
Show file tree

Hide file tree

Showing 49 changed files with 90 additions and 86 deletions.
diff --git a/ash/services/BUILD.gn b/ash/services/BUILD.gn
@@ -17,6 +17,7 @@ source_set("unit_tests") {
   testonly = true
   deps = [
     "//ash/services/cellular_setup:unit_tests",
+    "//ash/services/chromebox_for_meetings/public/cpp:unit_tests",
     "//ash/services/device_sync:unit_tests",
     "//ash/services/ime:services_unittests",
     "//ash/services/ime:unit_tests",

diff --git a/...meos/services/chromebox_for_meetings/DEPS → ash/services/chromebox_for_meetings/DEPS b/...meos/services/chromebox_for_meetings/DEPS → ash/services/chromebox_for_meetings/DEPS
diff --git a/...os/services/chromebox_for_meetings/OWNERS → ash/services/chromebox_for_meetings/OWNERS b/...os/services/chromebox_for_meetings/OWNERS → ash/services/chromebox_for_meetings/OWNERS
diff --git a/...services/chromebox_for_meetings/README.md → ...services/chromebox_for_meetings/README.md b/...services/chromebox_for_meetings/README.md → ...services/chromebox_for_meetings/README.md
diff --git a/...hromebox_for_meetings/public/cpp/BUILD.gn → ...hromebox_for_meetings/public/cpp/BUILD.gn b/...hromebox_for_meetings/public/cpp/BUILD.gn → ...hromebox_for_meetings/public/cpp/BUILD.gn
@@ -2,18 +2,19 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/ui_mode.gni")
 import("//chromeos/components/chromebox_for_meetings/buildflags/buildflags.gni")
 
-assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
 
 source_set("cpp") {
   sources = [
     "appid_util.cc",
     "appid_util.h",
   ]
   deps = [
+    "//ash/services/chromebox_for_meetings/public/mojom",
     "//base",
-    "//chromeos/services/chromebox_for_meetings/public/mojom",
   ]
   if (is_cfm) {
     sources += [
@@ -39,9 +40,9 @@ if (is_cfm) {
     ]
     deps = [
       ":cpp",
+      "//ash/services/chromebox_for_meetings/public/mojom",
       "//base",
       "//chromeos/dbus/chromebox_for_meetings",
-      "//chromeos/services/chromebox_for_meetings/public/mojom",
       "//mojo/public/cpp/bindings",
     ]
   }
@@ -52,8 +53,8 @@ source_set("unit_tests") {
   sources = [ "appid_util_unittest.cc" ]
   deps = [
     ":cpp",
+    "//ash/services/chromebox_for_meetings/public/mojom",
     "//base/test:test_support",
-    "//chromeos/services/chromebox_for_meetings/public/mojom",
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
     "//testing/gtest",

diff --git a/...box_for_meetings/public/cpp/appid_util.cc → ...box_for_meetings/public/cpp/appid_util.cc b/...box_for_meetings/public/cpp/appid_util.cc → ...box_for_meetings/public/cpp/appid_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/services/chromebox_for_meetings/public/cpp/appid_util.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/appid_util.h"
 
 #include "base/containers/contains.h"
 

diff --git a/...ebox_for_meetings/public/cpp/appid_util.h → ...ebox_for_meetings/public/cpp/appid_util.h b/...ebox_for_meetings/public/cpp/appid_util.h → ...ebox_for_meetings/public/cpp/appid_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_APPID_UTIL_H_
-#define CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_APPID_UTIL_H_
+#ifndef ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_APPID_UTIL_H_
+#define ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_APPID_UTIL_H_
 
 #include <string>
 
@@ -16,4 +16,4 @@ bool IsChromeboxForMeetingsAppId(const std::string& app_id);
 }  // namespace cfm
 }  // namespace chromeos
 
-#endif  // CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_APPID_UTIL_H_
+#endif  // ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_APPID_UTIL_H_
diff --git a/...eetings/public/cpp/appid_util_unittest.cc → ...eetings/public/cpp/appid_util_unittest.cc b/...eetings/public/cpp/appid_util_unittest.cc → ...eetings/public/cpp/appid_util_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/services/chromebox_for_meetings/public/cpp/appid_util.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/appid_util.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/...ngs/public/cpp/fake_service_connection.cc → ...ngs/public/cpp/fake_service_connection.cc b/...ngs/public/cpp/fake_service_connection.cc → ...ngs/public/cpp/fake_service_connection.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
 
 #include "base/bind.h"
 #include "base/files/file.h"

diff --git a/...ings/public/cpp/fake_service_connection.h → ...ings/public/cpp/fake_service_connection.h b/...ings/public/cpp/fake_service_connection.h → ...ings/public/cpp/fake_service_connection.h
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONNECTION_H_
-#define CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONNECTION_H_
+#ifndef ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONNECTION_H_
+#define ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONNECTION_H_
 
+#include "ash/services/chromebox_for_meetings/public/cpp/service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
 #include "base/bind.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/service_connection.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
-
 namespace chromeos {
 namespace cfm {
 
@@ -50,4 +49,4 @@ namespace ash::cfm {
 using ::chromeos::cfm::FakeServiceConnectionImpl;
 }
 
-#endif  // CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONNECTION_H_
+#endif  // ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONNECTION_H_
diff --git a/...etings/public/cpp/fake_service_context.cc → ...etings/public/cpp/fake_service_context.cc b/...etings/public/cpp/fake_service_context.cc → ...etings/public/cpp/fake_service_context.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_context.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_context.h"
 
 namespace chromeos {
 namespace cfm {

diff --git a/...eetings/public/cpp/fake_service_context.h → ...eetings/public/cpp/fake_service_context.h b/...eetings/public/cpp/fake_service_context.h → ...eetings/public/cpp/fake_service_context.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONTEXT_H_
-#define CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONTEXT_H_
+#ifndef ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONTEXT_H_
+#define ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONTEXT_H_
 
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
 #include "base/bind.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
-
 namespace chromeos {
 namespace cfm {
 
@@ -58,4 +57,4 @@ namespace ash::cfm {
 using ::chromeos::cfm::FakeCfmServiceContext;
 }
 
-#endif  // CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONTEXT_H_
+#endif  // ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_FAKE_SERVICE_CONTEXT_H_
diff --git a/...meetings/public/cpp/service_connection.cc → ...meetings/public/cpp/service_connection.cc b/...meetings/public/cpp/service_connection.cc → ...meetings/public/cpp/service_connection.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/services/chromebox_for_meetings/public/cpp/service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/service_connection.h"
 
 #include <memory>
 

diff --git a/..._meetings/public/cpp/service_connection.h → ..._meetings/public/cpp/service_connection.h b/..._meetings/public/cpp/service_connection.h → ..._meetings/public/cpp/service_connection.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_SERVICE_CONNECTION_H_
-#define CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_SERVICE_CONNECTION_H_
+#ifndef ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_SERVICE_CONNECTION_H_
+#define ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_SERVICE_CONNECTION_H_
 
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
 #include "base/bind.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
-
 namespace chromeos {
 namespace cfm {
 
@@ -44,4 +43,4 @@ namespace ash::cfm {
 using ::chromeos::cfm::ServiceConnection;
 }
 
-#endif  // CHROMEOS_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_SERVICE_CONNECTION_H_
+#endif  // ASH_SERVICES_CHROMEBOX_FOR_MEETINGS_PUBLIC_CPP_SERVICE_CONNECTION_H_
diff --git a/...public/cpp/service_connection_unittest.cc → ...public/cpp/service_connection_unittest.cc b/...public/cpp/service_connection_unittest.cc → ...public/cpp/service_connection_unittest.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/services/chromebox_for_meetings/public/cpp/service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/service_connection.h"
 
 #include <utility>
 #include <vector>
 
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/test/bind.h"
 #include "base/test/mock_callback.h"
 #include "base/test/task_environment.h"
 #include "chromeos/dbus/chromebox_for_meetings/cfm_hotline_client.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "testing/gmock/include/gmock/gmock.h"

diff --git a/...omebox_for_meetings/public/mojom/BUILD.gn → ...omebox_for_meetings/public/mojom/BUILD.gn b/...omebox_for_meetings/public/mojom/BUILD.gn → ...omebox_for_meetings/public/mojom/BUILD.gn
@@ -2,9 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/ui_mode.gni")
 import("//chromeos/components/chromebox_for_meetings/buildflags/buildflags.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
+
 mojom("mojom") {
   sources = [ "cfm_service_manager.mojom" ]
 

diff --git a/...hromebox_for_meetings/public/mojom/OWNERS → ...hromebox_for_meetings/public/mojom/OWNERS b/...hromebox_for_meetings/public/mojom/OWNERS → ...hromebox_for_meetings/public/mojom/OWNERS
diff --git a/...mebox_for_meetings/public/mojom/README.md → ...mebox_for_meetings/public/mojom/README.md b/...mebox_for_meetings/public/mojom/README.md → ...mebox_for_meetings/public/mojom/README.md
@@ -1,7 +1,7 @@
 These mojoms are for a service that exists outside of chromium. Implementation
 for CfmServiceContext are found in the private CrOS repo.
 
-Note: //chromeos/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom
+Note: //ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom
 is copied as is from its chromeos version as such the original file should be
 edited before changing this file.
 
@@ -11,8 +11,8 @@ lives in `chrome/browser/ash/chromebox_for_meetings/`.
 Hot-tip: Generate  Js w/
 
 ```
-$ ninja -C out_${BOARD}/Release/chromeos/services/chromebox_for_meetings/public/mojom:mojom_js
+$ ninja -C out_${BOARD}/Release/ash/services/chromebox_for_meetings/public/mojom:mojom_js
 ```
 These files can be found in:
 
-`out_${BOARD}/Release/gen/chromeos/services/chromebox_for_meetings/public/mojom`
+`out_${BOARD}/Release/gen/ash/services/chromebox_for_meetings/public/mojom`
diff --git a/...r_meetings/public/mojom/cfm_browser.mojom → ...r_meetings/public/mojom/cfm_browser.mojom b/...r_meetings/public/mojom/cfm_browser.mojom → ...r_meetings/public/mojom/cfm_browser.mojom
diff --git a/...s/public/mojom/cfm_network_settings.mojom → ...s/public/mojom/cfm_network_settings.mojom b/...s/public/mojom/cfm_network_settings.mojom → ...s/public/mojom/cfm_network_settings.mojom
diff --git a/...gs/public/mojom/cfm_service_manager.mojom → ...gs/public/mojom/cfm_service_manager.mojom b/...gs/public/mojom/cfm_service_manager.mojom → ...gs/public/mojom/cfm_service_manager.mojom
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
+// See ash/services/chromebox_for_meetings/public/mojom/README.md before
+// changing this file.
+//
 // Next MinVersion: 1
 
 module chromeos.cfm.mojom;

diff --git a/...c/mojom/external_display_brightness.mojom → ...c/mojom/external_display_brightness.mojom b/...c/mojom/external_display_brightness.mojom → ...c/mojom/external_display_brightness.mojom
diff --git a/...blic/mojom/meet_devices_diagnostics.mojom → ...blic/mojom/meet_devices_diagnostics.mojom b/...blic/mojom/meet_devices_diagnostics.mojom → ...blic/mojom/meet_devices_diagnostics.mojom
diff --git a/...ings/public/mojom/meet_devices_info.mojom → ...ings/public/mojom/meet_devices_info.mojom b/...ings/public/mojom/meet_devices_info.mojom → ...ings/public/mojom/meet_devices_info.mojom
diff --git a/...gs/public/mojom/meet_devices_logger.mojom → ...gs/public/mojom/meet_devices_logger.mojom b/...gs/public/mojom/meet_devices_logger.mojom → ...gs/public/mojom/meet_devices_logger.mojom
diff --git a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service.h b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_BROWSER_CFM_BROWSER_SERVICE_H_
 #define CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_BROWSER_CFM_BROWSER_SERVICE_H_
 
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ash/chromebox_for_meetings/service_adaptor.h"
 #include "chromeos/dbus/chromebox_for_meetings/cfm_observer.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 
 namespace ash::cfm {

diff --git a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service_unittest.cc
@@ -8,6 +8,11 @@
 #include <utility>
 #include <vector>
 
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_context.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
 #include "base/bind.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/field_trial_params.h"
@@ -18,11 +23,6 @@
 #include "base/test/scoped_field_trial_list_resetter.h"
 #include "base/test/task_environment.h"
 #include "chromeos/dbus/chromebox_for_meetings/fake_cfm_hotline_client.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_context.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/service_connection.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
 #include "components/variations/field_trial_config/field_trial_util.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"

diff --git a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_memory_details.h b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_memory_details.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_BROWSER_CFM_MEMORY_DETAILS_H_
 #define CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_BROWSER_CFM_MEMORY_DETAILS_H_
 
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom.h"
 #include "chrome/browser/memory_details.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom.h"
 #include "content/public/browser/render_process_host.h"
 
 namespace ash::cfm {

diff --git a/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service.h b/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service.h
@@ -5,12 +5,12 @@
 #ifndef CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
 #define CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
 
+#include "ash/services/chromebox_for_meetings/public/mojom/meet_devices_info.mojom.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/sequenced_task_runner.h"
 #include "chrome/browser/ash/chromebox_for_meetings/service_adaptor.h"
 #include "chrome/browser/ash/settings/device_settings_service.h"
 #include "chromeos/dbus/chromebox_for_meetings/cfm_observer.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/meet_devices_info.mojom.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "mojo/public/cpp/bindings/remote_set.h"
 

diff --git a/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service_unittest.cc
@@ -8,6 +8,11 @@
 #include <utility>
 #include <vector>
 
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_context.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/meet_devices_info.mojom.h"
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ -20,11 +25,6 @@
 #include "chrome/browser/ash/settings/device_settings_service.h"
 #include "chromeos/dbus/chromebox_for_meetings/fake_cfm_hotline_client.h"
 #include "chromeos/dbus/session_manager/fake_session_manager_client.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_context.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/service_connection.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/meet_devices_info.mojom.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "components/ownership/mock_owner_key_util.h"
 #include "content/public/test/test_utils.h"

diff --git a/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service.h b/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_DIAGNOSTICS_DIAGNOSTICS_SERVICE_H_
 #define CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_DIAGNOSTICS_DIAGNOSTICS_SERVICE_H_
 
+#include "ash/services/chromebox_for_meetings/public/mojom/meet_devices_diagnostics.mojom.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ash/chromebox_for_meetings/service_adaptor.h"
 #include "chromeos/dbus/chromebox_for_meetings/cfm_observer.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/meet_devices_diagnostics.mojom.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 
 namespace ash::cfm {

diff --git a/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service_unittest.cc
@@ -7,6 +7,12 @@
 #include <memory>
 #include <utility>
 #include <vector>
+
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/fake_service_context.h"
+#include "ash/services/chromebox_for_meetings/public/cpp/service_connection.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/meet_devices_diagnostics.mojom.h"
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ -16,11 +22,6 @@
 #include "chromeos/dbus/chromebox_for_meetings/fake_cfm_hotline_client.h"
 #include "chromeos/dbus/cros_healthd/cros_healthd_client.h"
 #include "chromeos/dbus/cros_healthd/fake_cros_healthd_client.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_context.h"
-#include "chromeos/services/chromebox_for_meetings/public/cpp/service_connection.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/meet_devices_diagnostics.mojom.h"
 #include "chromeos/services/cros_healthd/public/cpp/service_connection.h"
 #include "content/public/test/test_utils.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"

diff --git a/.../chromebox_for_meetings/external_display_brightness/external_display_brightness_service.h b/.../chromebox_for_meetings/external_display_brightness/external_display_brightness_service.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_EXTERNAL_DISPLAY_BRIGHTNESS_EXTERNAL_DISPLAY_BRIGHTNESS_SERVICE_H_
 #define CHROME_BROWSER_ASH_CHROMEBOX_FOR_MEETINGS_EXTERNAL_DISPLAY_BRIGHTNESS_EXTERNAL_DISPLAY_BRIGHTNESS_SERVICE_H_
 
+#include "ash/services/chromebox_for_meetings/public/mojom/external_display_brightness.mojom-shared.h"
+#include "ash/services/chromebox_for_meetings/public/mojom/external_display_brightness.mojom.h"
 #include "chrome/browser/ash/chromebox_for_meetings/service_adaptor.h"
 #include "chromeos/dbus/chromebox_for_meetings/cfm_observer.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/external_display_brightness.mojom-shared.h"
-#include "chromeos/services/chromebox_for_meetings/public/mojom/external_display_brightness.mojom.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"