Move //chrome/browser/{chromeos => ash}/apps

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Change-Id: I7740e8c0f3c0e204b6c8d7f9c328694532346fa2
Bug: 1164001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2738815
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@{#860626}

WATCHLISTS

@@ -129,11 +129,11 @@
     'apps': {
       'filepath': '^apps/'\
                   '|chrome/browser/apps/'\
-                  '|chrome/browser/chromeos/apps/'
+                  '|chrome/browser/ash/apps/'
     },
     'apps_intent_helper': {
       'filepath': 'chrome/browser/apps/intent_helper/|'\
-                  'chrome/browser/chromeos/apps/intent_helper/|'\
+                  'chrome/browser/ash/apps/intent_helper/|'\
                   'components/arc/intent_helper/'
     },
     'arc': {

chrome/browser/apps/digital_goods/util.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/apps/digital_goods/util.h"
 
 #include "base/optional.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_service.h"
+#include "chrome/browser/ash/apps/apk_web_app_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/web_applications/app_browser_controller.h"

chrome/browser/apps/intent_helper/intent_picker_helpers.cc

@@ -17,7 +17,7 @@
 #include "content/public/browser/web_contents.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/apps/intent_helper/chromeos_intent_picker_helpers.h"
+#include "chrome/browser/ash/apps/intent_helper/chromeos_intent_picker_helpers.h"
 #elif defined(OS_MAC)
 #include "chrome/browser/apps/intent_helper/mac_intent_picker_helpers.h"
 #endif

chrome/browser/chromeos/apps/README.md → chrome/browser/ash/apps/README.md

@@ -11,7 +11,7 @@ communicating with the browser and each other. This layer consists of
 app-platform-agnostic code, which each app platform's custom implementation
 then plugs into. Example features include:
 
-* `chromeos/apps/intent_helper` - allows installed apps that handle particular
+* `ash/apps/intent_helper` - allows installed apps that handle particular
   URLs to be opened by users from the omnibox. For ARC++, custom code queries
   the ARC++ container; for desktop PWAs, data is contained in the browser
   itself.

chrome/browser/chromeos/apps/apk_web_app_installer.cc → chrome/browser/ash/apps/apk_web_app_installer.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/apps/apk_web_app_installer.h"
+#include "chrome/browser/ash/apps/apk_web_app_installer.h"
 
 #include <limits>
 #include <utility>

chrome/browser/chromeos/apps/apk_web_app_installer.h → chrome/browser/ash/apps/apk_web_app_installer.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_APPS_APK_WEB_APP_INSTALLER_H_
-#define CHROME_BROWSER_CHROMEOS_APPS_APK_WEB_APP_INSTALLER_H_
+#ifndef CHROME_BROWSER_ASH_APPS_APK_WEB_APP_INSTALLER_H_
+#define CHROME_BROWSER_ASH_APPS_APK_WEB_APP_INSTALLER_H_
 
 #include <memory>
 #include <vector>
@@ -96,4 +96,4 @@ class ApkWebAppInstaller {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_APPS_APK_WEB_APP_INSTALLER_H_
+#endif  // CHROME_BROWSER_ASH_APPS_APK_WEB_APP_INSTALLER_H_

chrome/browser/chromeos/apps/apk_web_app_installer_browsertest.cc → chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc

@@ -15,8 +15,8 @@
 #include "base/test/bind.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_installer.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_service.h"
+#include "chrome/browser/ash/apps/apk_web_app_installer.h"
+#include "chrome/browser/ash/apps/apk_web_app_service.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/chromeos/apps/apk_web_app_installer_unittest.cc → chrome/browser/ash/apps/apk_web_app_installer_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_installer.h"
+#include "chrome/browser/ash/apps/apk_web_app_installer.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_app_id.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"

chrome/browser/chromeos/apps/apk_web_app_service.cc → chrome/browser/ash/apps/apk_web_app_service.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/apps/apk_web_app_service.h"
+#include "chrome/browser/ash/apps/apk_web_app_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/feature_list.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_service_factory.h"
+#include "chrome/browser/ash/apps/apk_web_app_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/web_applications/components/app_registrar.h"

chrome/browser/chromeos/apps/apk_web_app_service.h → chrome/browser/ash/apps/apk_web_app_service.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_APPS_APK_WEB_APP_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_APPS_APK_WEB_APP_SERVICE_H_
+#ifndef CHROME_BROWSER_ASH_APPS_APK_WEB_APP_SERVICE_H_
+#define CHROME_BROWSER_ASH_APPS_APK_WEB_APP_SERVICE_H_
 
 #include <string>
 #include <vector>
@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_installer.h"
+#include "chrome/browser/ash/apps/apk_web_app_installer.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/web_applications/components/app_registrar.h"
 #include "chrome/browser/web_applications/components/app_registrar_observer.h"
@@ -123,4 +123,4 @@ class ApkWebAppService : public KeyedService,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_APPS_APK_WEB_APP_SERVICE_H_
+#endif  // CHROME_BROWSER_ASH_APPS_APK_WEB_APP_SERVICE_H_

chrome/browser/chromeos/apps/apk_web_app_service_factory.cc → chrome/browser/ash/apps/apk_web_app_service_factory.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/apps/apk_web_app_service_factory.h"
+#include "chrome/browser/ash/apps/apk_web_app_service_factory.h"
 
-#include "chrome/browser/chromeos/apps/apk_web_app_service.h"
+#include "chrome/browser/ash/apps/apk_web_app_service.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/chromeos/apps/apk_web_app_service_factory.h → chrome/browser/ash/apps/apk_web_app_service_factory.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_APPS_APK_WEB_APP_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_APPS_APK_WEB_APP_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_ASH_APPS_APK_WEB_APP_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_ASH_APPS_APK_WEB_APP_SERVICE_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/singleton.h"
@@ -50,4 +50,4 @@ class ApkWebAppServiceFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_APPS_APK_WEB_APP_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_ASH_APPS_APK_WEB_APP_SERVICE_FACTORY_H_

chrome/browser/chromeos/apps/intent_helper/chromeos_intent_picker_helpers.cc → chrome/browser/ash/apps/intent_helper/chromeos_intent_picker_helpers.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/apps/intent_helper/chromeos_intent_picker_helpers.h"
+#include "chrome/browser/ash/apps/intent_helper/chromeos_intent_picker_helpers.h"
 
 #include <algorithm>
 #include <utility>
@@ -18,7 +18,7 @@
 #include "chrome/browser/apps/intent_helper/intent_picker_auto_display_service.h"
 #include "chrome/browser/apps/intent_helper/intent_picker_constants.h"
 #include "chrome/browser/apps/intent_helper/intent_picker_internal.h"
-#include "chrome/browser/chromeos/apps/metrics/intent_handling_metrics.h"
+#include "chrome/browser/ash/apps/metrics/intent_handling_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/intent_picker_tab_helper.h"
 #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
@@ -216,7 +216,6 @@ void OnAppIconsLoaded(content::WebContents* web_contents,
 
 void MaybeShowIntentPickerChromeOs(
     content::NavigationHandle* navigation_handle) {
-
   content::WebContents* web_contents = navigation_handle->GetWebContents();
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());

chrome/browser/chromeos/apps/intent_helper/chromeos_intent_picker_helpers.h → chrome/browser/ash/apps/intent_helper/chromeos_intent_picker_helpers.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_APPS_INTENT_HELPER_CHROMEOS_INTENT_PICKER_HELPERS_H_
-#define CHROME_BROWSER_CHROMEOS_APPS_INTENT_HELPER_CHROMEOS_INTENT_PICKER_HELPERS_H_
+#ifndef CHROME_BROWSER_ASH_APPS_INTENT_HELPER_CHROMEOS_INTENT_PICKER_HELPERS_H_
+#define CHROME_BROWSER_ASH_APPS_INTENT_HELPER_CHROMEOS_INTENT_PICKER_HELPERS_H_
 
 #include <string>
 #include <vector>
@@ -38,4 +38,4 @@ PickerEntryType GetPickerEntryType(mojom::AppType app_type);
 
 }  // namespace apps
 
-#endif  // CHROME_BROWSER_CHROMEOS_APPS_INTENT_HELPER_CHROMEOS_INTENT_PICKER_HELPERS_H_
+#endif  // CHROME_BROWSER_ASH_APPS_INTENT_HELPER_CHROMEOS_INTENT_PICKER_HELPERS_H_

chrome/browser/chromeos/apps/intent_helper/common_apps_navigation_throttle.cc → chrome/browser/ash/apps/intent_helper/common_apps_navigation_throttle.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/apps/intent_helper/common_apps_navigation_throttle.h"
+#include "chrome/browser/ash/apps/intent_helper/common_apps_navigation_throttle.h"
 
 #include <utility>
 
@@ -12,9 +12,9 @@
 #include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/apps/intent_helper/apps_navigation_types.h"
 #include "chrome/browser/apps/intent_helper/intent_picker_internal.h"
+#include "chrome/browser/ash/apps/intent_helper/chromeos_intent_picker_helpers.h"
+#include "chrome/browser/ash/apps/metrics/intent_handling_metrics.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/apps/intent_helper/chromeos_intent_picker_helpers.h"
-#include "chrome/browser/chromeos/apps/metrics/intent_handling_metrics.h"
 #include "chrome/browser/chromeos/policy/system_features_disable_list_policy_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"

chrome/browser/chromeos/apps/intent_helper/common_apps_navigation_throttle.h → chrome/browser/ash/apps/intent_helper/common_apps_navigation_throttle.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_APPS_INTENT_HELPER_COMMON_APPS_NAVIGATION_THROTTLE_H_
-#define CHROME_BROWSER_CHROMEOS_APPS_INTENT_HELPER_COMMON_APPS_NAVIGATION_THROTTLE_H_
+#ifndef CHROME_BROWSER_ASH_APPS_INTENT_HELPER_COMMON_APPS_NAVIGATION_THROTTLE_H_
+#define CHROME_BROWSER_ASH_APPS_INTENT_HELPER_COMMON_APPS_NAVIGATION_THROTTLE_H_
 
 #include <memory>
 #include <string>
@@ -39,7 +39,6 @@ class CommonAppsNavigationThrottle : public apps::AppsNavigationThrottle {
   ~CommonAppsNavigationThrottle() override;
 
  private:
-
   bool ShouldCancelNavigation(content::NavigationHandle* handle) override;
   bool ShouldShowDisablePage(content::NavigationHandle* handle) override;
   ThrottleCheckResult MaybeShowCustomResult() override;
@@ -49,4 +48,4 @@ class CommonAppsNavigationThrottle : public apps::AppsNavigationThrottle {
 
 }  // namespace apps
 
-#endif  // CHROME_BROWSER_CHROMEOS_APPS_INTENT_HELPER_COMMON_APPS_NAVIGATION_THROTTLE_H_
+#endif  // CHROME_BROWSER_ASH_APPS_INTENT_HELPER_COMMON_APPS_NAVIGATION_THROTTLE_H_

chrome/browser/chromeos/apps/metrics/intent_handling_metrics.cc → chrome/browser/ash/apps/metrics/intent_handling_metrics.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/apps/metrics/intent_handling_metrics.h"
+#include "chrome/browser/ash/apps/metrics/intent_handling_metrics.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/apps/intent_helper/apps_navigation_types.h"

chrome/browser/chromeos/apps/metrics/intent_handling_metrics.h → chrome/browser/ash/apps/metrics/intent_handling_metrics.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_APPS_METRICS_INTENT_HANDLING_METRICS_H_
-#define CHROME_BROWSER_CHROMEOS_APPS_METRICS_INTENT_HANDLING_METRICS_H_
+#ifndef CHROME_BROWSER_ASH_APPS_METRICS_INTENT_HANDLING_METRICS_H_
+#define CHROME_BROWSER_ASH_APPS_METRICS_INTENT_HANDLING_METRICS_H_
 
 #include <string>
 #include <utility>
@@ -114,4 +114,4 @@ class IntentHandlingMetrics {
 
 }  // namespace apps
 
-#endif  // CHROME_BROWSER_CHROMEOS_APPS_METRICS_INTENT_HANDLING_METRICS_H_
+#endif  // CHROME_BROWSER_ASH_APPS_METRICS_INTENT_HANDLING_METRICS_H_

chrome/browser/chromeos/apps/metrics/intent_handling_metrics_unittest.cc → chrome/browser/ash/apps/metrics/intent_handling_metrics_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/apps/metrics/intent_handling_metrics.h"
+#include "chrome/browser/ash/apps/metrics/intent_handling_metrics.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/test/gtest_util.h"

chrome/browser/chrome_content_browser_client.cc

@@ -520,7 +520,7 @@
 // single navigation throttle to display the intent picker on all platforms.
 #if !defined(OS_ANDROID)
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/apps/intent_helper/common_apps_navigation_throttle.h"
+#include "chrome/browser/ash/apps/intent_helper/common_apps_navigation_throttle.h"
 #else
 #include "chrome/browser/apps/intent_helper/apps_navigation_throttle.h"
 #endif

chrome/browser/chromeos/BUILD.gn

@@ -549,6 +549,18 @@ source_set("chromeos") {
     "../ash/app_mode/web_app/web_kiosk_app_launcher.h",
     "../ash/app_mode/web_app/web_kiosk_app_manager.cc",
     "../ash/app_mode/web_app/web_kiosk_app_manager.h",
+    "../ash/apps/apk_web_app_installer.cc",
+    "../ash/apps/apk_web_app_installer.h",
+    "../ash/apps/apk_web_app_service.cc",
+    "../ash/apps/apk_web_app_service.h",
+    "../ash/apps/apk_web_app_service_factory.cc",
+    "../ash/apps/apk_web_app_service_factory.h",
+    "../ash/apps/intent_helper/chromeos_intent_picker_helpers.cc",
+    "../ash/apps/intent_helper/chromeos_intent_picker_helpers.h",
+    "../ash/apps/intent_helper/common_apps_navigation_throttle.cc",
+    "../ash/apps/intent_helper/common_apps_navigation_throttle.h",
+    "../ash/apps/metrics/intent_handling_metrics.cc",
+    "../ash/apps/metrics/intent_handling_metrics.h",
     "../ash/assistant/assistant_util.cc",
     "../ash/assistant/assistant_util.h",
     "../ash/authpolicy/authpolicy_credentials_manager.cc",
@@ -1118,18 +1130,6 @@ source_set("chromeos") {
     "android_sms/fcm_connection_establisher.h",
     "android_sms/pairing_lost_notifier.cc",
     "android_sms/pairing_lost_notifier.h",
-    "apps/apk_web_app_installer.cc",
-    "apps/apk_web_app_installer.h",
-    "apps/apk_web_app_service.cc",
-    "apps/apk_web_app_service.h",
-    "apps/apk_web_app_service_factory.cc",
-    "apps/apk_web_app_service_factory.h",
-    "apps/intent_helper/chromeos_intent_picker_helpers.cc",
-    "apps/intent_helper/chromeos_intent_picker_helpers.h",
-    "apps/intent_helper/common_apps_navigation_throttle.cc",
-    "apps/intent_helper/common_apps_navigation_throttle.h",
-    "apps/metrics/intent_handling_metrics.cc",
-    "apps/metrics/intent_handling_metrics.h",
     "arc/accessibility/accessibility_info_data_wrapper.cc",
     "arc/accessibility/accessibility_info_data_wrapper.h",
     "arc/accessibility/accessibility_node_info_data_wrapper.cc",
@@ -3466,6 +3466,8 @@ source_set("unit_tests") {
     "../ash/app_mode/kiosk_session_plugin_handler_unittest.cc",
     "../ash/app_mode/startup_app_launcher_unittest.cc",
     "../ash/app_mode/web_app/web_kiosk_app_launcher_unittest.cc",
+    "../ash/apps/apk_web_app_installer_unittest.cc",
+    "../ash/apps/metrics/intent_handling_metrics_unittest.cc",
     "../ash/assistant/assistant_util_unittest.cc",
     "../ash/authpolicy/authpolicy_credentials_manager_unittest.cc",
     "../ash/authpolicy/authpolicy_helper.unittest.cc",
@@ -3549,8 +3551,6 @@ source_set("unit_tests") {
     "android_sms/connection_manager_unittest.cc",
     "android_sms/fcm_connection_establisher_unittest.cc",
     "android_sms/pairing_lost_notifier_unittest.cc",
-    "apps/apk_web_app_installer_unittest.cc",
-    "apps/metrics/intent_handling_metrics_unittest.cc",
     "arc/accessibility/accessibility_node_info_data_wrapper_unittest.cc",
     "arc/accessibility/arc_accessibility_helper_bridge_unittest.cc",
     "arc/accessibility/arc_accessibility_test_util.h",

chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc

@@ -11,7 +11,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/apps/intent_helper/page_transition_util.h"
-#include "chrome/browser/chromeos/apps/metrics/intent_handling_metrics.h"
+#include "chrome/browser/ash/apps/metrics/intent_handling_metrics.h"
 #include "chrome/browser/chromeos/arc/arc_web_contents_data.h"
 #include "chrome/browser/chromeos/external_protocol_dialog.h"
 #include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h"

chrome/browser/chromeos/arc/session/arc_service_launcher.cc

@@ -12,9 +12,9 @@
 #include "base/check_op.h"
 #include "base/files/file_util.h"
 #include "chrome/browser/apps/app_service/arc_apps_factory.h"
+#include "chrome/browser/ash/apps/apk_web_app_service.h"
 #include "chrome/browser/ash/login/startup_utils.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_service.h"
 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
 #include "chrome/browser/chromeos/arc/adbd/arc_adbd_monitor_bridge.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"

chrome/browser/payments/chrome_payment_request_delegate.cc

@@ -45,7 +45,7 @@
 #include "third_party/libaddressinput/chromium/chrome_storage_impl.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/apps/apk_web_app_service.h"
+#include "chrome/browser/ash/apps/apk_web_app_service.h"
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 namespace payments {

chrome/browser/prefs/browser_prefs.cc

@@ -253,7 +253,7 @@
 #include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/ash/app_mode/kiosk_cryptohome_remover.h"
 #include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_service.h"
+#include "chrome/browser/ash/apps/apk_web_app_service.h"
 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
 #include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
 #include "chrome/browser/chromeos/bluetooth/debug_logs_manager.h"

chrome/browser/ui/ash/chrome_new_window_client.cc

@@ -19,10 +19,10 @@
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/launch_utils.h"
+#include "chrome/browser/ash/apps/apk_web_app_service.h"
+#include "chrome/browser/ash/apps/metrics/intent_handling_metrics.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/ash/web_applications/chrome_camera_app_ui_delegate.h"
-#include "chrome/browser/chromeos/apps/apk_web_app_service.h"
-#include "chrome/browser/chromeos/apps/metrics/intent_handling_metrics.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/arc/arc_web_contents_data.h"
 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_url_util.h"