Move SystemWebAppManager to web_application:common

This CL is a preparation to use SystemWebAppManager in WebAppTabHelper.

Bug: 1024655
Change-Id: Id2a4e71e852696bfbf8386ffdd221d523ab55161
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2040755
Commit-Queue: Jiewei Qian  <qjw@chromium.org>
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739236}

chrome/browser/chromeos/BUILD.gn

@@ -78,6 +78,7 @@ source_set("chromeos") {
     "//chrome/browser/ui/webui/bluetooth_internals:mojo_bindings",
     "//chrome/browser/ui/webui/chromeos/crostini_upgrader:mojo_bindings",
     "//chrome/browser/web_applications",
+    "//chrome/browser/web_applications:common",
     "//chrome/browser/web_applications:web_applications_on_extensions",
     "//chrome/browser/web_applications/components",
     "//chrome/browser/web_applications/extensions:extensions",
@@ -327,6 +328,7 @@ source_set("chromeos") {
     "//chrome/browser/extensions",
     "//chrome/browser/apps/platform_apps/api",
     "//chrome/browser/web_applications",
+    "//chrome/browser/web_applications:common",
     "//chrome/browser/web_applications/components",
   ]
 

chrome/browser/web_applications/BUILD.gn

@@ -20,6 +20,8 @@ source_set("common") {
     "manifest_update_manager.h",
     "manifest_update_task.cc",
     "manifest_update_task.h",
+    "system_web_app_manager.cc",
+    "system_web_app_manager.h",
     "web_app_tab_helper.cc",
     "web_app_tab_helper.h",
   ]
@@ -30,9 +32,19 @@ source_set("common") {
     "//chrome/browser/web_applications/components",
     "//chrome/common",
     "//components/content_settings/core/browser",
+    "//components/pref_registry",
     "//content/public/browser",
     "//skia",
   ]
+
+  if (is_chromeos) {
+    deps += [
+      "//ash/public/cpp",
+      "//chromeos/components/help_app_ui",
+      "//chromeos/components/media_app_ui",
+      "//chromeos/constants",
+    ]
+  }
 }
 
 source_set("web_applications") {
@@ -47,8 +59,6 @@ source_set("web_applications") {
     "pending_app_manager_impl.h",
     "pending_app_registration_task.cc",
     "pending_app_registration_task.h",
-    "system_web_app_manager.cc",
-    "system_web_app_manager.h",
     "web_app.cc",
     "web_app.h",
     "web_app_database.cc",
@@ -81,7 +91,6 @@ source_set("web_applications") {
     ":web_app_group",
     "//chrome/browser/web_applications/components",
     "//chrome/common",
-    "//components/pref_registry",
     "//components/sync",
     "//content/public/browser",
     "//skia",
@@ -89,10 +98,6 @@ source_set("web_applications") {
 
   if (is_chromeos) {
     deps += [
-      "//ash/public/cpp:cpp",
-      "//chromeos/components/help_app_ui",
-      "//chromeos/components/media_app_ui",
-      "//chromeos/constants",
       "//components/arc:arc_base",
       "//components/arc/mojom",
     ]
@@ -149,6 +154,7 @@ source_set("web_applications_test_support") {
   ]
 
   deps = [
+    ":common",
     ":web_app_test_group",
     ":web_applications",
     "//base/test:test_support",
@@ -178,6 +184,7 @@ source_set("web_applications_unit_tests") {
   ]
 
   deps = [
+    ":common",
     ":web_app_test_group",
     ":web_applications",
     ":web_applications_on_extensions_test_support",
@@ -275,6 +282,7 @@ source_set("web_applications_on_extensions_test_support") {
   ]
 
   deps = [
+    ":common",
     ":web_app_test_group",
     ":web_applications",
     ":web_applications_on_extensions",
@@ -290,6 +298,7 @@ group("unit_tests") {
   testonly = true
 
   deps = [
+    ":common",
     ":web_app_test_group",
     ":web_applications_unit_tests",
     "//chrome/browser/web_applications/components:unit_tests",

chrome/browser/web_applications/components/web_app_provider_base.h

@@ -13,17 +13,18 @@ class Profile;
 namespace web_app {
 
 // Forward declarations of generalized interfaces.
-class PendingAppManager;
-class InstallManager;
-class InstallFinalizer;
+class AppIconManager;
 class AppRegistrar;
 class AppRegistryController;
-class FileHandlerManager;
-class AppIconManager;
 class AppShortcutManager;
-class WebAppPolicyManager;
+class FileHandlerManager;
+class InstallFinalizer;
+class InstallManager;
 class ManifestUpdateManager;
+class PendingAppManager;
+class SystemWebAppManager;
 class WebAppAudioFocusIdMap;
+class WebAppPolicyManager;
 class WebAppUiManager;
 
 class WebAppProviderBase : public KeyedService {
@@ -61,6 +62,8 @@ class WebAppProviderBase : public KeyedService {
 
   virtual AppShortcutManager& shortcut_manager() = 0;
 
+  virtual SystemWebAppManager& system_web_app_manager() = 0;
+
   DISALLOW_COPY_AND_ASSIGN(WebAppProviderBase);
 };
 

chrome/browser/web_applications/extensions/BUILD.gn

@@ -59,6 +59,7 @@ source_set("unit_tests") {
   deps = [
     ":extensions",
     "//chrome/browser",
+    "//chrome/browser/web_applications:common",
     "//chrome/browser/web_applications:web_app_test_group",
     "//chrome/browser/web_applications:web_applications",
     "//chrome/browser/web_applications:web_applications_on_extensions",

chrome/browser/web_applications/web_app_provider.h

@@ -79,8 +79,7 @@ class WebAppProvider : public WebAppProviderBase {
   FileHandlerManager& file_handler_manager() override;
   AppIconManager& icon_manager() override;
   AppShortcutManager& shortcut_manager() override;
-
-  SystemWebAppManager& system_web_app_manager();
+  SystemWebAppManager& system_web_app_manager() override;
 
   // KeyedService:
   void Shutdown() override;