Move //chrome/browser/{ui => ash}/app_list [1/N]

This CL moves app_service/ of chrome/browser/ui/app_list to ash.

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

Bug: 1164001
Change-Id: I4f1f718b6e91dac023a277c9d27ecfbf083efb17
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4054722
Owners-Override: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1079107}

WATCHLISTS

@@ -126,7 +126,7 @@
     },
     'app_service': {
       'filepath': 'chrome/browser/apps/app_service/'\
-                  '|chrome/browser/ui/app_list/app_service/'\
+                  '|chrome/browser/ash/app_list/app_service/'\
                   '|chrome/browser/ui/ash/shelf/app_service/'\
                   '|chrome/browser/ui/views/apps/app_dialog/' \
                   '|components/services/app_service/',

chrome/browser/ash/app_list/DEPS

@@ -0,0 +1,32 @@
+# TODO(https://crbug.com/1164001): When this file is edited, same file in
+# //chrome/browser/ui/app_list should be updated as well. We need
+# to sync both files until the migration is done.
+include_rules = [
+  "+ash/app_list/model",
+  "+ash/resources",
+  "+ash/strings",
+  "+components/app_constants",
+  "+components/services/app_service/public",
+]
+
+specific_include_rules = {
+  "app_service_app_item_browsertest\.cc": [
+    "+ash/app_list/app_list_controller_impl.h",
+    "+ash/app_list/app_list_model_provider.h",
+    "+ash/app_list/model/app_list_item.h",
+    "+ash/shell.h",
+  ],
+
+  "app_list_sort_browsertest\.cc": [
+    "+ash/app_list/app_list_model_provider.h",
+    "+ash/app_list/views/app_list_item_view.h",
+    "+ash/app_list/views/app_list_menu_model_adapter.h",
+    "+ash/app_list/views/apps_grid_context_menu.h",
+    "+ash/app_list/views/apps_grid_view.h",
+    "+ash/shell.h",
+  ],
+
+  "app_list_syncable_service_unittest\.cc": [
+    "+cc/base/math_util.h",
+  ],
+}

chrome/browser/ash/app_list/DIR_METADATA

@@ -0,0 +1,6 @@
+# TODO(https://crbug.com/1164001): When this file is edited, same file in
+# //chrome/browser/ash/app_list should be updated as well. We need
+# to sync both files until the migration is done.
+monorail {
+  component: "UI>Shell>Launcher"
+}

chrome/browser/ash/app_list/OWNERS

@@ -0,0 +1,14 @@
+dominickn@chromium.org
+jennyz@chromium.org
+khmel@chromium.org
+nancylingwang@chromium.org
+tbarzic@chromium.org
+xiyuan@chromium.org
+
+# Mainly for launcher search and ranking purposes.
+amandadeacon@chromium.org
+tby@chromium.org
+thanhdng@chromium.org
+wrong@chromium.org
+
+per-file app_launch_event_logger*=charleszhao@chromium.org

chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.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/ui/app_list/app_service/app_service_app_icon_loader.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
 
 #include "base/containers/contains.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"

chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.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_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ICON_LOADER_H_
-#define CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ICON_LOADER_H_
+#ifndef CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ICON_LOADER_H_
+#define CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ICON_LOADER_H_
 
 #include <map>
 #include <set>
@@ -66,4 +66,4 @@ class AppServiceAppIconLoader : public AppIconLoader,
   base::WeakPtrFactory<AppServiceAppIconLoader> weak_ptr_factory_{this};
 };
 
-#endif  // CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ICON_LOADER_H_
+#endif  // CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ICON_LOADER_H_

chrome/browser/ash/app_list/app_service/app_service_app_item.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/ui/app_list/app_service/app_service_app_item.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_item.h"
 
 #include "ash/constants/ash_features.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
@@ -22,11 +22,11 @@
 #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/app_list/app_service/app_service_context_menu.h"
 #include "chrome/browser/ash/crostini/crostini_util.h"
 #include "chrome/browser/ash/remote_apps/remote_apps_manager.h"
 #include "chrome/browser/ash/remote_apps/remote_apps_manager_factory.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_context_menu.h"
 #include "chrome/browser/ui/ash/shelf/chrome_shelf_controller.h"
 #include "components/services/app_service/public/cpp/app_types.h"
 

chrome/browser/ash/app_list/app_service/app_service_app_item.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_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ITEM_H_
-#define CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ITEM_H_
+#ifndef CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ITEM_H_
+#define CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ITEM_H_
 
 #include <memory>
 
@@ -63,4 +63,4 @@ class AppServiceAppItem : public ChromeAppListItem,
   base::WeakPtrFactory<AppServiceAppItem> weak_ptr_factory_{this};
 };
 
-#endif  // CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ITEM_H_
+#endif  // CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_ITEM_H_

chrome/browser/ash/app_list/app_service/app_service_app_item_browsertest.cc

@@ -17,10 +17,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/platform_apps/app_browsertest_util.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_item.h"
 #include "chrome/browser/ash/system_web_apps/system_web_app_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_client_impl.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_item.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/web_applications/web_app_launch_manager.h"
 #include "chrome/browser/web_applications/test/with_crosapi_param.h"

chrome/browser/ash/app_list/app_service/app_service_app_model_builder.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/app_list/app_service/app_service_app_model_builder.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_model_builder.h"
 
 #include "ash/public/cpp/app_list/app_list_types.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/ash/app_list/app_service/app_service_app_item.h"
 #include "chrome/browser/ash/arc/arc_util.h"
 #include "chrome/browser/ash/crostini/crostini_util.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_item.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/services/app_service/public/cpp/app_types.h"
 #include "components/sync/protocol/app_list_specifics.pb.h"

chrome/browser/ash/app_list/app_service/app_service_app_model_builder.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_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_MODEL_BUILDER_H_
-#define CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_MODEL_BUILDER_H_
+#ifndef CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_MODEL_BUILDER_H_
+#define CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_MODEL_BUILDER_H_
 
 #include "chrome/browser/ui/app_list/app_list_model_builder.h"
 #include "components/services/app_service/public/cpp/app_registry_cache.h"
@@ -35,4 +35,4 @@ class AppServiceAppModelBuilder : public AppListModelBuilder,
   std::unique_ptr<AppListModelUpdaterObserver> crostini_folder_observer_;
 };
 
-#endif  // CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_APP_MODEL_BUILDER_H_
+#endif  // CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_APP_MODEL_BUILDER_H_

chrome/browser/ash/app_list/app_service/app_service_app_model_builder_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/ui/app_list/app_service/app_service_app_model_builder.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_model_builder.h"
 
 #include <memory>
 #include <set>

chrome/browser/ash/app_list/app_service/app_service_context_menu.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/ui/app_list/app_service/app_service_context_menu.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_context_menu.h"
 
 #include "ash/constants/ash_features.h"
 #include "ash/public/cpp/app_list/app_list_types.h"

chrome/browser/ash/app_list/app_service/app_service_context_menu.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_UI_APP_LIST_APP_SERVICE_APP_SERVICE_CONTEXT_MENU_H_
-#define CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_CONTEXT_MENU_H_
+#ifndef CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_CONTEXT_MENU_H_
+#define CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_CONTEXT_MENU_H_
 
 #include <memory>
 #include <string>
@@ -97,4 +97,4 @@ class AppServiceContextMenu : public app_list::AppContextMenu {
   base::WeakPtrFactory<AppServiceContextMenu> weak_ptr_factory_{this};
 };
 
-#endif  // CHROME_BROWSER_UI_APP_LIST_APP_SERVICE_APP_SERVICE_CONTEXT_MENU_H_
+#endif  // CHROME_BROWSER_ASH_APP_LIST_APP_SERVICE_APP_SERVICE_CONTEXT_MENU_H_

chrome/browser/ui/BUILD.gn

@@ -1942,6 +1942,14 @@ static_library("ui") {
     assert(enable_supervised_users)
     assert(toolkit_views)
     sources += [
+      "../ash/app_list/app_service/app_service_app_icon_loader.cc",
+      "../ash/app_list/app_service/app_service_app_icon_loader.h",
+      "../ash/app_list/app_service/app_service_app_item.cc",
+      "../ash/app_list/app_service/app_service_app_item.h",
+      "../ash/app_list/app_service/app_service_app_model_builder.cc",
+      "../ash/app_list/app_service/app_service_app_model_builder.h",
+      "../ash/app_list/app_service/app_service_context_menu.cc",
+      "../ash/app_list/app_service/app_service_context_menu.h",
       "app_icon_loader_delegate.h",
       "app_list/app_context_menu.cc",
       "app_list/app_context_menu.h",
@@ -1963,14 +1971,6 @@ static_library("ui") {
       "app_list/app_list_syncable_service.h",
       "app_list/app_list_syncable_service_factory.cc",
       "app_list/app_list_syncable_service_factory.h",
-      "app_list/app_service/app_service_app_icon_loader.cc",
-      "app_list/app_service/app_service_app_icon_loader.h",
-      "app_list/app_service/app_service_app_item.cc",
-      "app_list/app_service/app_service_app_item.h",
-      "app_list/app_service/app_service_app_model_builder.cc",
-      "app_list/app_service/app_service_app_model_builder.h",
-      "app_list/app_service/app_service_context_menu.cc",
-      "app_list/app_service/app_service_context_menu.h",
       "app_list/app_sync_ui_state.cc",
       "app_list/app_sync_ui_state.h",
       "app_list/app_sync_ui_state_factory.cc",

chrome/browser/ui/app_list/DEPS

@@ -1,3 +1,6 @@
+# TODO(https://crbug.com/1164001): When this file is edited, same file in
+# //chrome/browser/ash/app_list should be updated as well. We need
+# to sync both files until the migration is done.
 include_rules = [
   "+ash/app_list/model",
   "+ash/resources",

chrome/browser/ui/app_list/DIR_METADATA

@@ -1,3 +1,6 @@
+# TODO(https://crbug.com/1164001): When this file is edited, same file in
+# //chrome/browser/ash/app_list should be updated as well. We need
+# to sync both files until the migration is done.
 monorail {
   component: "UI>Shell>Launcher"
 }

chrome/browser/ui/app_list/OWNERS

@@ -1,11 +1 @@
-dominickn@chromium.org
-jennyz@chromium.org
-khmel@chromium.org
-nancylingwang@chromium.org
-tbarzic@chromium.org
-xiyuan@chromium.org
-
-# Mainly for launcher search and ranking purposes.
-file://chrome/browser/ui/app_list/search/OWNERS
-
-per-file app_launch_event_logger*=charleszhao@chromium.org
+file://chrome/browser/ash/app_list/OWNERS

chrome/browser/ui/app_list/app_context_menu_unittest.cc

@@ -22,6 +22,8 @@
 #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/app_service_test.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_item.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_context_menu.h"
 #include "chrome/browser/ash/crosapi/browser_util.h"
 #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
@@ -32,8 +34,6 @@
 #include "chrome/browser/ui/app_list/app_context_menu_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_test_util.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_item.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_context_menu.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
 #include "chrome/browser/ui/app_list/chrome_app_list_item.h"

chrome/browser/ui/app_list/app_list_syncable_service.cc

@@ -23,6 +23,7 @@
 #include "build/build_config.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/ash/app_list/app_service/app_service_app_model_builder.h"
 #include "chrome/browser/ash/arc/arc_util.h"
 #include "chrome/browser/ash/crostini/crostini_features.h"
 #include "chrome/browser/ash/crostini/crostini_util.h"
@@ -34,7 +35,6 @@
 #include "chrome/browser/ui/app_list/app_list_model_updater.h"
 #include "chrome/browser/ui/app_list/app_list_sync_model_sanitizer.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_model_builder.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/app_list/chrome_app_list_item.h"

chrome/browser/ui/app_list/arc/arc_app_unittest.cc

@@ -41,6 +41,9 @@
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/publishers/arc_apps.h"
 #include "chrome/browser/apps/app_service/publishers/arc_apps_factory.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_item.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_model_builder.h"
 #include "chrome/browser/ash/arc/arc_optin_uma.h"
 #include "chrome/browser/ash/arc/arc_support_host.h"
 #include "chrome/browser/ash/arc/arc_util.h"
@@ -49,9 +52,6 @@
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/sync/sync_service_factory.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_item.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_model_builder.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_launcher.h"

chrome/browser/ui/app_list/search/app_service_app_result.cc

@@ -14,10 +14,10 @@
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/apps/app_service/metrics/app_service_metrics.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_context_menu.h"
 #include "chrome/browser/favicon/large_icon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_client_impl.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_context_menu.h"
 #include "chrome/browser/ui/app_list/internal_app/internal_app_metadata.h"
 #include "chrome/browser/ui/app_list/search/common/icon_constants.h"
 #include "chrome/browser/ui/ash/shelf/chrome_shelf_controller.h"

chrome/browser/ui/app_list/search/arc/arc_app_shortcut_search_result.cc

@@ -12,10 +12,10 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/chromeos/arc/icon_decode_request.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/app_list/search/common/icon_constants.h"

chrome/browser/ui/ash/shelf/arc_app_window.cc

@@ -8,8 +8,8 @@
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/shelf/arc_app_window_delegate.h"

chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc

@@ -38,6 +38,7 @@
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/extension_apps_utils.h"
 #include "chrome/browser/apps/icon_standardizer.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/ash/arc/arc_util.h"
 #include "chrome/browser/ash/crosapi/browser_util.h"
 #include "chrome/browser/extensions/chrome_app_icon_loader.h"
@@ -47,7 +48,6 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/app_list_client_impl.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/app_list/md_icon_normalizer.h"
 #include "chrome/browser/ui/apps/app_info_dialog.h"

chrome/browser/ui/ash/shelf/crostini_app_window.cc

@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/ash/shelf/crostini_app_window.h"
 
+#include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_icon_loader_delegate.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h"
 #include "extensions/common/constants.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/widget/widget.h"

chrome/browser/ui/views/arc_app_dialog_view.cc

@@ -6,9 +6,9 @@
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.h"

chrome/browser/ui/views/arc_data_removal_dialog_view.cc

@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/app_list/arc/arc_data_removal_dialog.h"
 
+#include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/ash/arc/session/arc_session_manager.h"
 #include "chrome/browser/ash/arc/session/arc_session_manager_observer.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc

@@ -24,6 +24,7 @@
 #include "chrome/app/chrome_command_ids.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/ash/app_list/app_service/app_service_app_item.h"
 #include "chrome/browser/ash/crosapi/url_handler_ash.h"
 #include "chrome/browser/ash/login/login_manager_test.h"
 #include "chrome/browser/ash/login/test/login_manager_mixin.h"
@@ -37,7 +38,6 @@
 #include "chrome/browser/profiles/delete_profile_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
-#include "chrome/browser/ui/app_list/app_service/app_service_app_item.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.h"
 #include "chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.h"

chrome/test/BUILD.gn

@@ -3649,6 +3649,8 @@ if (!is_android) {
         "../browser/ash/accessibility/switch_access_browsertest.cc",
         "../browser/ash/accessibility/touch_exploration_controller_browsertest.cc",
         "../browser/ash/account_manager/account_manager_policy_controller_browsertest.cc",
+        "../browser/ash/app_list/app_service/app_service_app_item_browsertest.cc",
+        "../browser/ash/app_list/app_service/app_service_context_menu_browsertest.cc",
         "../browser/ash/app_mode/arc/arc_kiosk_app_manager_browsertest.cc",
         "../browser/ash/app_mode/kiosk_app_manager_browsertest.cc",
         "../browser/ash/app_mode/kiosk_app_update_service_browsertest.cc",
@@ -4042,8 +4044,6 @@ if (!is_android) {
         "../browser/support_tool/ash/ui_hierarchy_data_collector_browsertest.cc",
         "../browser/ui/app_list/app_list_client_impl_browsertest.cc",
         "../browser/ui/app_list/app_list_sort_browsertest.cc",
-        "../browser/ui/app_list/app_service/app_service_app_item_browsertest.cc",
-        "../browser/ui/app_list/app_service/app_service_context_menu_browsertest.cc",
         "../browser/ui/app_list/arc/arc_usb_host_permission_browsertest.cc",
         "../browser/ui/app_list/chrome_app_list_item_browsertest.cc",
         "../browser/ui/app_list/chrome_app_list_model_updater_browsertest.cc",
@@ -7325,6 +7325,7 @@ test("unit_tests") {
       "../browser/apps/app_service/publishers/plugin_vm_apps_unittest.cc",
       "../browser/apps/app_service/webapk/webapk_install_task_unittest.cc",
       "../browser/apps/app_service/webapk/webapk_manager_unittest.cc",
+      "../browser/ash/app_list/app_service/app_service_app_model_builder_unittest.cc",
       "../browser/ash/attestation/attestation_policy_unittest.cc",
       "../browser/ash/dbus/chrome_features_service_provider_unittest.cc",
       "../browser/ash/login/screens/reset_screen_unittest.cc",
@@ -7413,7 +7414,6 @@ test("unit_tests") {
       "../browser/ui/app_list/app_list_syncable_service_unittest.cc",
       "../browser/ui/app_list/app_list_test_util.cc",
       "../browser/ui/app_list/app_list_test_util.h",
-      "../browser/ui/app_list/app_service/app_service_app_model_builder_unittest.cc",
       "../browser/ui/app_list/arc/arc_app_test.cc",
       "../browser/ui/app_list/arc/arc_app_test.h",
       "../browser/ui/app_list/arc/arc_app_unittest.cc",