Move screens/ from chrome/browser/chromeos/login/ [3/4]

Move screens/[o-t]* to chrome/browser/ash/login/. This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Bug: 1164001 Change-Id: Ifed6496af7b799f20da51254af01949219b8dbd7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2718191 Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Owners-Override: Hidehiko Abe <hidehiko@chromium.org> Cr-Commit-Position: refs/heads/master@{#857901}
chromium · Feb 25, 2021 · 81312ab · 81312ab
1 parent da515f8
commit 81312ab
Show file tree

Hide file tree

Showing 73 changed files with 178 additions and 177 deletions.
diff --git a/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc b/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc
@@ -12,9 +12,9 @@
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
+#include "chrome/browser/ash/login/screens/sync_consent_screen.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
-#include "chrome/browser/chromeos/login/screens/sync_consent_screen.h"
 #include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/login_manager_mixin.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"

diff --git a/...eos/login/screens/offline_login_screen.cc → ...ash/login/screens/offline_login_screen.cc b/...eos/login/screens/offline_login_screen.cc → ...ash/login/screens/offline_login_screen.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/login/screens/offline_login_screen.h"
+#include "chrome/browser/ash/login/screens/offline_login_screen.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram_functions.h"

diff --git a/...meos/login/screens/offline_login_screen.h → .../ash/login/screens/offline_login_screen.h b/...meos/login/screens/offline_login_screen.h → .../ash/login/screens/offline_login_screen.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_LOGIN_SCREENS_OFFLINE_LOGIN_SCREEN_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_OFFLINE_LOGIN_SCREEN_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_OFFLINE_LOGIN_SCREEN_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_OFFLINE_LOGIN_SCREEN_H_
 
 #include <string>
 
@@ -86,4 +86,4 @@ class OfflineLoginScreen
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_OFFLINE_LOGIN_SCREEN_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_OFFLINE_LOGIN_SCREEN_H_
diff --git a/.../login/screens/packaged_license_screen.cc → .../login/screens/packaged_license_screen.cc b/.../login/screens/packaged_license_screen.cc → .../login/screens/packaged_license_screen.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/login/screens/packaged_license_screen.h"
+#include "chrome/browser/ash/login/screens/packaged_license_screen.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"

diff --git a/...s/login/screens/packaged_license_screen.h → ...h/login/screens/packaged_license_screen.h b/...s/login/screens/packaged_license_screen.h → ...h/login/screens/packaged_license_screen.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_LOGIN_SCREENS_PACKAGED_LICENSE_SCREEN_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_PACKAGED_LICENSE_SCREEN_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_PACKAGED_LICENSE_SCREEN_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_PACKAGED_LICENSE_SCREEN_H_
 
 #include <string>
 
@@ -65,4 +65,4 @@ class PackagedLicenseScreen : public BaseScreen {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_PACKAGED_LICENSE_SCREEN_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_PACKAGED_LICENSE_SCREEN_H_
diff --git a/...ns/packaged_license_screen_browsertest.cc → ...ns/packaged_license_screen_browsertest.cc b/...ns/packaged_license_screen_browsertest.cc → ...ns/packaged_license_screen_browsertest.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/login/screens/packaged_license_screen.h"
+#include "chrome/browser/ash/login/screens/packaged_license_screen.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"

diff --git a/.../login/screens/parental_handoff_screen.cc → .../login/screens/parental_handoff_screen.cc b/.../login/screens/parental_handoff_screen.cc → .../login/screens/parental_handoff_screen.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/login/screens/parental_handoff_screen.h"
+#include "chrome/browser/ash/login/screens/parental_handoff_screen.h"
 
 #include <string>
 

diff --git a/...s/login/screens/parental_handoff_screen.h → ...h/login/screens/parental_handoff_screen.h b/...s/login/screens/parental_handoff_screen.h → ...h/login/screens/parental_handoff_screen.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_LOGIN_SCREENS_PARENTAL_HANDOFF_SCREEN_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_PARENTAL_HANDOFF_SCREEN_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_PARENTAL_HANDOFF_SCREEN_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_PARENTAL_HANDOFF_SCREEN_H_
 
 #include <string>
 
@@ -52,4 +52,4 @@ class ParentalHandoffScreen : public BaseScreen {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_PARENTAL_HANDOFF_SCREEN_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_PARENTAL_HANDOFF_SCREEN_H_
diff --git a/...ns/parental_handoff_screen_browsertest.cc → ...ns/parental_handoff_screen_browsertest.cc b/...ns/parental_handoff_screen_browsertest.cc → ...ns/parental_handoff_screen_browsertest.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/login/screens/parental_handoff_screen.h"
+#include "chrome/browser/ash/login/screens/parental_handoff_screen.h"
 
 #include <memory>
 

diff --git a/...hromeos/login/screens/pin_setup_screen.cc → ...ser/ash/login/screens/pin_setup_screen.cc b/...hromeos/login/screens/pin_setup_screen.cc → ...ser/ash/login/screens/pin_setup_screen.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/login/screens/pin_setup_screen.h"
+#include "chrome/browser/ash/login/screens/pin_setup_screen.h"
 
 #include <memory>
 

diff --git a/...chromeos/login/screens/pin_setup_screen.h → ...wser/ash/login/screens/pin_setup_screen.h b/...chromeos/login/screens/pin_setup_screen.h → ...wser/ash/login/screens/pin_setup_screen.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_LOGIN_SCREENS_PIN_SETUP_SCREEN_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_PIN_SETUP_SCREEN_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_PIN_SETUP_SCREEN_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_PIN_SETUP_SCREEN_H_
 
 #include <string>
 
@@ -83,4 +83,4 @@ class PinSetupScreen : public BaseScreen {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_PIN_SETUP_SCREEN_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_PIN_SETUP_SCREEN_H_
diff --git a/...n/screens/pin_setup_screen_browsertest.cc → ...n/screens/pin_setup_screen_browsertest.cc b/...n/screens/pin_setup_screen_browsertest.cc → ...n/screens/pin_setup_screen_browsertest.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/login/screens/pin_setup_screen.h"
+#include "chrome/browser/ash/login/screens/pin_setup_screen.h"
 
 #include "ash/constants/ash_features.h"
 #include "ash/public/cpp/test/shell_test_api.h"

diff --git a/...recommend_apps/device_configuration.proto → ...recommend_apps/device_configuration.proto b/...recommend_apps/device_configuration.proto → ...recommend_apps/device_configuration.proto
diff --git a/...mmend_apps/fake_recommend_apps_fetcher.cc → ...mmend_apps/fake_recommend_apps_fetcher.cc b/...mmend_apps/fake_recommend_apps_fetcher.cc → ...mmend_apps/fake_recommend_apps_fetcher.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/login/screens/recommend_apps/fake_recommend_apps_fetcher.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/fake_recommend_apps_fetcher.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
 
 namespace chromeos {
 

diff --git a/...ommend_apps/fake_recommend_apps_fetcher.h → ...ommend_apps/fake_recommend_apps_fetcher.h b/...ommend_apps/fake_recommend_apps_fetcher.h → ...ommend_apps/fake_recommend_apps_fetcher.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h"
 
 namespace chromeos {
 
@@ -43,4 +43,4 @@ class FakeRecommendAppsFetcher : public RecommendAppsFetcher {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_H_
diff --git a/...s/fake_recommend_apps_fetcher_delegate.cc → ...s/fake_recommend_apps_fetcher_delegate.cc b/...s/fake_recommend_apps_fetcher_delegate.cc → ...s/fake_recommend_apps_fetcher_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/login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h"
 
 #include <utility>
 

diff --git a/...ps/fake_recommend_apps_fetcher_delegate.h → ...ps/fake_recommend_apps_fetcher_delegate.h b/...ps/fake_recommend_apps_fetcher_delegate.h → ...ps/fake_recommend_apps_fetcher_delegate.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_DELEGATE_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_DELEGATE_H_
 
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
 
 #include "base/callback.h"
 #include "base/values.h"
@@ -63,4 +63,4 @@ class FakeRecommendAppsFetcherDelegate : public RecommendAppsFetcherDelegate {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_DELEGATE_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_FAKE_RECOMMEND_APPS_FETCHER_DELEGATE_H_
diff --git a/.../recommend_apps/recommend_apps_fetcher.cc → .../recommend_apps/recommend_apps_fetcher.cc b/.../recommend_apps/recommend_apps_fetcher.cc → .../recommend_apps/recommend_apps_fetcher.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/login/screens/recommend_apps/recommend_apps_fetcher.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h"
 
 #include "ash/constants/ash_switches.h"
 #include "ash/public/ash_interfaces.h"
@@ -12,8 +12,8 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/system/sys_info.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/fake_recommend_apps_fetcher.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/fake_recommend_apps_fetcher.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/storage_partition.h"

diff --git a/...s/recommend_apps/recommend_apps_fetcher.h → ...s/recommend_apps/recommend_apps_fetcher.h b/...s/recommend_apps/recommend_apps_fetcher.h → ...s/recommend_apps/recommend_apps_fetcher.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_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_H_
 
 #include <memory>
 
@@ -31,4 +31,4 @@ class RecommendAppsFetcher {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_H_
diff --git a/...nd_apps/recommend_apps_fetcher_delegate.h → ...nd_apps/recommend_apps_fetcher_delegate.h b/...nd_apps/recommend_apps_fetcher_delegate.h → ...nd_apps/recommend_apps_fetcher_delegate.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_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_DELEGATE_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_DELEGATE_H_
 
 namespace base {
 class Value;
@@ -28,4 +28,4 @@ class RecommendAppsFetcherDelegate {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_DELEGATE_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_DELEGATE_H_
diff --git a/...mmend_apps/recommend_apps_fetcher_impl.cc → ...mmend_apps/recommend_apps_fetcher_impl.cc b/...mmend_apps/recommend_apps_fetcher_impl.cc → ...mmend_apps/recommend_apps_fetcher_impl.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/login/screens/recommend_apps/recommend_apps_fetcher_impl.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h"
 
 #include "ash/public/mojom/cros_display_config.mojom.h"
 #include "base/base64url.h"
@@ -16,7 +16,7 @@
 #include "base/strings/string_util.h"
 #include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "extensions/common/api/system_display.h"
 #include "gpu/config/gpu_info.h"

diff --git a/...ommend_apps/recommend_apps_fetcher_impl.h → ...ommend_apps/recommend_apps_fetcher_impl.h b/...ommend_apps/recommend_apps_fetcher_impl.h → ...ommend_apps/recommend_apps_fetcher_impl.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_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_IMPL_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_IMPL_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_IMPL_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_IMPL_H_
 
 #include <memory>
 #include <string>
@@ -14,8 +14,8 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h"
 #include "chrome/browser/chromeos/login/screens/recommend_apps/device_configuration.pb.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher.h"
 #include "components/arc/arc_features_parser.h"
 #include "extensions/browser/api/system_display/display_info_provider.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
@@ -163,4 +163,4 @@ class RecommendAppsFetcherImpl : public RecommendAppsFetcher {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_IMPL_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_RECOMMEND_APPS_FETCHER_IMPL_H_
diff --git a/...s/recommend_apps_fetcher_impl_unittest.cc → ...s/recommend_apps_fetcher_impl_unittest.cc b/...s/recommend_apps_fetcher_impl_unittest.cc → ...s/recommend_apps_fetcher_impl_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/login/screens/recommend_apps/recommend_apps_fetcher_impl.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h"
 
 #include <memory>
 #include <utility>
@@ -16,8 +16,8 @@
 #include "base/strings/string_util.h"
 #include "base/test/task_environment.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"

diff --git a/...ed_test_recommend_apps_fetcher_factory.cc → ...ed_test_recommend_apps_fetcher_factory.cc b/...ed_test_recommend_apps_fetcher_factory.cc → ...ed_test_recommend_apps_fetcher_factory.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/login/screens/recommend_apps/scoped_test_recommend_apps_fetcher_factory.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/scoped_test_recommend_apps_fetcher_factory.h"
 
 namespace chromeos {
 

diff --git a/...ped_test_recommend_apps_fetcher_factory.h → ...ped_test_recommend_apps_fetcher_factory.h b/...ped_test_recommend_apps_fetcher_factory.h → ...ped_test_recommend_apps_fetcher_factory.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_LOGIN_SCREENS_RECOMMEND_APPS_SCOPED_TEST_RECOMMEND_APPS_FETCHER_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_SCOPED_TEST_RECOMMEND_APPS_FETCHER_FACTORY_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_SCOPED_TEST_RECOMMEND_APPS_FETCHER_FACTORY_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_SCOPED_TEST_RECOMMEND_APPS_FETCHER_FACTORY_H_
 
 #include "base/callback.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h"
 
 namespace chromeos {
 
@@ -23,4 +23,4 @@ class ScopedTestRecommendAppsFetcherFactory {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_SCOPED_TEST_RECOMMEND_APPS_FETCHER_FACTORY_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_SCOPED_TEST_RECOMMEND_APPS_FETCHER_FACTORY_H_
diff --git a/...os/login/screens/recommend_apps_screen.cc → ...sh/login/screens/recommend_apps_screen.cc b/...os/login/screens/recommend_apps_screen.cc → ...sh/login/screens/recommend_apps_screen.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/login/screens/recommend_apps_screen.h"
+#include "chrome/browser/ash/login/screens/recommend_apps_screen.h"
 
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/webui/chromeos/login/recommend_apps_screen_handler.h"

diff --git a/...eos/login/screens/recommend_apps_screen.h → ...ash/login/screens/recommend_apps_screen.h b/...eos/login/screens/recommend_apps_screen.h → ...ash/login/screens/recommend_apps_screen.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_SCREEN_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_SCREEN_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_SCREEN_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_SCREEN_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "chrome/browser/ash/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
+#include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
 
 namespace base {
 class Value;
@@ -83,4 +83,4 @@ class RecommendAppsScreen : public BaseScreen,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RECOMMEND_APPS_SCREEN_H_
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_SCREEN_H_