Reland "Move //chrome/browser/{chromeos => ash}/system"

This is a reland of 612daee Original change's description: > Move //chrome/browser/{chromeos => ash}/system > > This CL is part of the Chrome OS source code directory migration: > https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. > > Bug: 1164001 > Change-Id: I93e71672b03a73da5b193d43553f6f7ad6ad0fce > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2683654 > 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/master@{#852435} Bug: 1164001 Change-Id: I971360a29e9e383c93ae1eccda1dc0c0e86a5d91 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2686058 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: sebsg <sebsg@chromium.org> Auto-Submit: sebsg <sebsg@chromium.org> Cr-Commit-Position: refs/heads/master@{#852870}
Denger-Network · Feb 10, 2021 · a43d74a · a43d74a
1 parent 1c9a9ab
commit a43d74a
Show file tree

Hide file tree

Showing 87 changed files with 177 additions and 177 deletions.
diff --git a/chrome/browser/ash/app_mode/kiosk_app_update_service.cc b/chrome/browser/ash/app_mode/kiosk_app_update_service.cc
@@ -7,9 +7,9 @@
 #include "base/logging.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"

diff --git a/chrome/browser/ash/app_mode/kiosk_app_update_service.h b/chrome/browser/ash/app_mode/kiosk_app_update_service.h
@@ -14,8 +14,8 @@
 #include "chrome/browser/ash/app_mode/kiosk_app_manager_observer.h"
 // TODO(https://crbug.com/1164001): forward declare when moved to
 // chrome/browser/ash/.
-#include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
-#include "chrome/browser/chromeos/system/automatic_reboot_manager_observer.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager_observer.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "extensions/browser/update_observer.h"

diff --git a/chrome/browser/ash/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/ash/app_mode/kiosk_app_update_service_browsertest.cc
@@ -27,10 +27,10 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "chrome/browser/apps/platform_apps/app_browsertest_util.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager_observer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
-#include "chrome/browser/chromeos/system/automatic_reboot_manager_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"

diff --git a/chrome/browser/chromeos/system/OWNERS → chrome/browser/ash/system/OWNERS b/chrome/browser/chromeos/system/OWNERS → chrome/browser/ash/system/OWNERS
diff --git a/...romeos/system/automatic_reboot_manager.cc → ...er/ash/system/automatic_reboot_manager.cc b/...romeos/system/automatic_reboot_manager.cc → ...er/ash/system/automatic_reboot_manager.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 "chrome/browser/chromeos/system/automatic_reboot_manager.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager.h"
 
 #include <fcntl.h>
 #include <stddef.h>

diff --git a/...hromeos/system/automatic_reboot_manager.h → ...ser/ash/system/automatic_reboot_manager.h b/...hromeos/system/automatic_reboot_manager.h → ...ser/ash/system/automatic_reboot_manager.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 CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_
+#define CHROME_BROWSER_ASH_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_
 
 #include <memory>
 
@@ -15,7 +15,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/chromeos/system/automatic_reboot_manager_observer.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager_observer.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "chromeos/dbus/update_engine_client.h"
 #include "components/prefs/pref_change_registrar.h"
@@ -197,4 +197,4 @@ using ::chromeos::system::AutomaticRebootManager;
 }
 }  // namespace ash
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_
diff --git a/...ystem/automatic_reboot_manager_observer.h → ...ystem/automatic_reboot_manager_observer.h b/...ystem/automatic_reboot_manager_observer.h → ...ystem/automatic_reboot_manager_observer.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 CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_OBSERVER_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_AUTOMATIC_REBOOT_MANAGER_OBSERVER_H_
+#define CHROME_BROWSER_ASH_SYSTEM_AUTOMATIC_REBOOT_MANAGER_OBSERVER_H_
 
 namespace chromeos {
 namespace system {
@@ -36,4 +36,4 @@ using ::chromeos::system::AutomaticRebootManagerObserver;
 }
 }  // namespace ash
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_OBSERVER_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_AUTOMATIC_REBOOT_MANAGER_OBSERVER_H_
diff --git a/...stem/automatic_reboot_manager_unittest.cc → ...stem/automatic_reboot_manager_unittest.cc b/...stem/automatic_reboot_manager_unittest.cc → ...stem/automatic_reboot_manager_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 "chrome/browser/chromeos/system/automatic_reboot_manager.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager.h"
 
 #include <string>
 
@@ -23,9 +23,9 @@
 #include "base/time/tick_clock.h"
 #include "base/values.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
+#include "chrome/browser/ash/system/automatic_reboot_manager_observer.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/system/automatic_reboot_manager_observer.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/dbus/dbus_thread_manager.h"

diff --git a/...romeos/system/breakpad_consent_watcher.cc → ...er/ash/system/breakpad_consent_watcher.cc b/...romeos/system/breakpad_consent_watcher.cc → ...er/ash/system/breakpad_consent_watcher.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 "chrome/browser/chromeos/system/breakpad_consent_watcher.h"
+#include "chrome/browser/ash/system/breakpad_consent_watcher.h"
 
 #include <string>
 

diff --git a/...hromeos/system/breakpad_consent_watcher.h → ...ser/ash/system/breakpad_consent_watcher.h b/...hromeos/system/breakpad_consent_watcher.h → ...ser/ash/system/breakpad_consent_watcher.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 CHROME_BROWSER_CHROMEOS_SYSTEM_BREAKPAD_CONSENT_WATCHER_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_BREAKPAD_CONSENT_WATCHER_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_BREAKPAD_CONSENT_WATCHER_H_
+#define CHROME_BROWSER_ASH_SYSTEM_BREAKPAD_CONSENT_WATCHER_H_
 
 #include <memory>
 
@@ -52,4 +52,4 @@ class BreakpadConsentWatcher {
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_BREAKPAD_CONSENT_WATCHER_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_BREAKPAD_CONSENT_WATCHER_H_
diff --git a/...os/system/device_disabling_browsertest.cc → ...sh/system/device_disabling_browsertest.cc b/...os/system/device_disabling_browsertest.cc → ...sh/system/device_disabling_browsertest.cc
@@ -13,6 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
+#include "chrome/browser/ash/system/device_disabling_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
@@ -25,7 +26,6 @@
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/system/device_disabling_manager.h"
 #include "chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"

diff --git a/...romeos/system/device_disabling_manager.cc → ...er/ash/system/device_disabling_manager.cc b/...romeos/system/device_disabling_manager.cc → ...er/ash/system/device_disabling_manager.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 "chrome/browser/chromeos/system/device_disabling_manager.h"
+#include "chrome/browser/ash/system/device_disabling_manager.h"
 
 #include "ash/constants/ash_switches.h"
 #include "base/bind.h"

diff --git a/...hromeos/system/device_disabling_manager.h → ...ser/ash/system/device_disabling_manager.h b/...hromeos/system/device_disabling_manager.h → ...ser/ash/system/device_disabling_manager.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 CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_DEVICE_DISABLING_MANAGER_H_
+#define CHROME_BROWSER_ASH_SYSTEM_DEVICE_DISABLING_MANAGER_H_
 
 #include <memory>
 #include <string>
@@ -154,4 +154,4 @@ class DeviceDisablingManager {
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_DEVICE_DISABLING_MANAGER_H_
diff --git a/...ice_disabling_manager_default_delegate.cc → ...ice_disabling_manager_default_delegate.cc b/...ice_disabling_manager_default_delegate.cc → ...ice_disabling_manager_default_delegate.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 "chrome/browser/chromeos/system/device_disabling_manager_default_delegate.h"
+#include "chrome/browser/ash/system/device_disabling_manager_default_delegate.h"
 
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"

diff --git a/...vice_disabling_manager_default_delegate.h → ...vice_disabling_manager_default_delegate.h b/...vice_disabling_manager_default_delegate.h → ...vice_disabling_manager_default_delegate.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_DEFAULT_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_DEFAULT_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_DEVICE_DISABLING_MANAGER_DEFAULT_DELEGATE_H_
+#define CHROME_BROWSER_ASH_SYSTEM_DEVICE_DISABLING_MANAGER_DEFAULT_DELEGATE_H_
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/system/device_disabling_manager.h"
+#include "chrome/browser/ash/system/device_disabling_manager.h"
 
 namespace chromeos {
 namespace system {
@@ -27,4 +27,4 @@ class DeviceDisablingManagerDefaultDelegate
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_DEFAULT_DELEGATE_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_DEVICE_DISABLING_MANAGER_DEFAULT_DELEGATE_H_
diff --git a/...stem/device_disabling_manager_unittest.cc → ...stem/device_disabling_manager_unittest.cc b/...stem/device_disabling_manager_unittest.cc → ...stem/device_disabling_manager_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 "chrome/browser/chromeos/system/device_disabling_manager.h"
+#include "chrome/browser/ash/system/device_disabling_manager.h"
 
 #include "ash/constants/ash_switches.h"
 #include "base/bind.h"

diff --git a/...meos/system/fake_input_device_settings.cc → .../ash/system/fake_input_device_settings.cc b/...meos/system/fake_input_device_settings.cc → .../ash/system/fake_input_device_settings.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 "chrome/browser/chromeos/system/fake_input_device_settings.h"
+#include "chrome/browser/ash/system/fake_input_device_settings.h"
 
 #include <utility>
 

diff --git a/...omeos/system/fake_input_device_settings.h → ...r/ash/system/fake_input_device_settings.h b/...omeos/system/fake_input_device_settings.h → ...r/ash/system/fake_input_device_settings.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_FAKE_INPUT_DEVICE_SETTINGS_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_FAKE_INPUT_DEVICE_SETTINGS_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_FAKE_INPUT_DEVICE_SETTINGS_H_
+#define CHROME_BROWSER_ASH_SYSTEM_FAKE_INPUT_DEVICE_SETTINGS_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "chrome/browser/chromeos/system/input_device_settings.h"
+#include "chrome/browser/ash/system/input_device_settings.h"
 
 namespace chromeos {
 namespace system {
@@ -72,4 +72,4 @@ class FakeInputDeviceSettings : public InputDeviceSettings,
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_FAKE_INPUT_DEVICE_SETTINGS_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_FAKE_INPUT_DEVICE_SETTINGS_H_
diff --git a/.../chromeos/system/input_device_settings.cc → ...owser/ash/system/input_device_settings.cc b/.../chromeos/system/input_device_settings.cc → ...owser/ash/system/input_device_settings.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 "chrome/browser/chromeos/system/input_device_settings.h"
+#include "chrome/browser/ash/system/input_device_settings.h"
 
 #include "chrome/browser/chromeos/policy/enrollment_requisition_manager.h"
 #include "chromeos/system/statistics_provider.h"

diff --git a/...r/chromeos/system/input_device_settings.h → ...rowser/ash/system/input_device_settings.h b/...r/chromeos/system/input_device_settings.h → ...rowser/ash/system/input_device_settings.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 CHROME_BROWSER_CHROMEOS_SYSTEM_INPUT_DEVICE_SETTINGS_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_INPUT_DEVICE_SETTINGS_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_INPUT_DEVICE_SETTINGS_H_
+#define CHROME_BROWSER_ASH_SYSTEM_INPUT_DEVICE_SETTINGS_H_
 
 #include "base/callback_forward.h"
 #include "base/optional.h"
@@ -310,4 +310,4 @@ class InputDeviceSettings {
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_INPUT_DEVICE_SETTINGS_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_INPUT_DEVICE_SETTINGS_H_
diff --git a/...ystem/input_device_settings_impl_ozone.cc → ...ystem/input_device_settings_impl_ozone.cc b/...ystem/input_device_settings_impl_ozone.cc → ...ystem/input_device_settings_impl_ozone.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/system/input_device_settings.h"
+#include "chrome/browser/ash/system/input_device_settings.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "chrome/browser/ash/system/fake_input_device_settings.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/system/fake_input_device_settings.h"
 #include "chromeos/system/devicemode.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/ozone/public/input_controller.h"

diff --git a/...hromeos/system/pointer_device_observer.cc → ...ser/ash/system/pointer_device_observer.cc b/...hromeos/system/pointer_device_observer.cc → ...ser/ash/system/pointer_device_observer.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/system/pointer_device_observer.h"
+#include "chrome/browser/ash/system/pointer_device_observer.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
-#include "chrome/browser/chromeos/system/input_device_settings.h"
+#include "chrome/browser/ash/system/input_device_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/events/devices/device_data_manager.h"
 

diff --git a/...chromeos/system/pointer_device_observer.h → ...wser/ash/system/pointer_device_observer.h b/...chromeos/system/pointer_device_observer.h → ...wser/ash/system/pointer_device_observer.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 CHROME_BROWSER_CHROMEOS_SYSTEM_POINTER_DEVICE_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_POINTER_DEVICE_OBSERVER_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_POINTER_DEVICE_OBSERVER_H_
+#define CHROME_BROWSER_ASH_SYSTEM_POINTER_DEVICE_OBSERVER_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -61,4 +61,4 @@ class PointerDeviceObserver : public ui::InputDeviceEventObserver {
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_POINTER_DEVICE_OBSERVER_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_POINTER_DEVICE_OBSERVER_H_
diff --git a/...me/browser/chromeos/system/procfs_util.cc → chrome/browser/ash/system/procfs_util.cc b/...me/browser/chromeos/system/procfs_util.cc → chrome/browser/ash/system/procfs_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 "chrome/browser/chromeos/system/procfs_util.h"
+#include "chrome/browser/ash/system/procfs_util.h"
 
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"

diff --git a/chrome/browser/chromeos/system/procfs_util.h → chrome/browser/ash/system/procfs_util.h b/chrome/browser/chromeos/system/procfs_util.h → chrome/browser/ash/system/procfs_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 CHROME_BROWSER_CHROMEOS_SYSTEM_PROCFS_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_PROCFS_UTIL_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_PROCFS_UTIL_H_
+#define CHROME_BROWSER_ASH_SYSTEM_PROCFS_UTIL_H_
 
 #include "base/files/file_path.h"
 #include "base/values.h"
@@ -61,4 +61,4 @@ base::Optional<int64_t> GetUsedMemTotalKB(
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_PROCFS_UTIL_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_PROCFS_UTIL_H_
diff --git a/...r/chromeos/system/procfs_util_unittest.cc → ...rowser/ash/system/procfs_util_unittest.cc b/...r/chromeos/system/procfs_util_unittest.cc → ...rowser/ash/system/procfs_util_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "chrome/browser/chromeos/system/procfs_util.h"
+#include "chrome/browser/ash/system/procfs_util.h"
 
 namespace chromeos {
 namespace system {

diff --git a/...e/browser/chromeos/system/system_clock.cc → chrome/browser/ash/system/system_clock.cc b/...e/browser/chromeos/system/system_clock.cc → chrome/browser/ash/system/system_clock.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/system/system_clock.h"
+#include "chrome/browser/ash/system/system_clock.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
+#include "chrome/browser/ash/system/system_clock_observer.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/system/system_clock_observer.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/login/login_state/login_state.h"
 #include "chromeos/settings/cros_settings_names.h"

diff --git a/...me/browser/chromeos/system/system_clock.h → chrome/browser/ash/system/system_clock.h b/...me/browser/chromeos/system/system_clock.h → chrome/browser/ash/system/system_clock.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 CHROME_BROWSER_CHROMEOS_SYSTEM_SYSTEM_CLOCK_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_SYSTEM_CLOCK_H_
+#ifndef CHROME_BROWSER_ASH_SYSTEM_SYSTEM_CLOCK_H_
+#define CHROME_BROWSER_ASH_SYSTEM_SYSTEM_CLOCK_H_
 
 #include <memory>
 
@@ -101,4 +101,4 @@ class SystemClock : public chromeos::LoginState::Observer,
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_SYSTEM_CLOCK_H_
+#endif  // CHROME_BROWSER_ASH_SYSTEM_SYSTEM_CLOCK_H_
diff --git a/.../chromeos/system/system_clock_observer.cc → ...owser/ash/system/system_clock_observer.cc b/.../chromeos/system/system_clock_observer.cc → ...owser/ash/system/system_clock_observer.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 "chrome/browser/chromeos/system/system_clock_observer.h"
+#include "chrome/browser/ash/system/system_clock_observer.h"
 
 namespace chromeos {
 namespace system {