Move ManifestUpdateManager and ManifestUpdateTask into web_application:common

ManifestUpdateManager and ManifestUpdateTask are not used outside of
web_applications and are not isolated components, they should live one
level up while maintaining independence from the BMO/Extension backend.

This CL is in preparation to add a dependency from
ManifestUpdateManager to SystemWebAppManager.

Bug: 1035242
Change-Id: I3a5e8e691079619e5b063ac90653dcae6ee3f76f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1973441
Auto-Submit: Alan Cutter <alancutter@chromium.org>
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733898}

chrome/browser/web_applications/BUILD.gn

@@ -16,14 +16,20 @@ group("web_app_test_group") {
 # Extension codepaths have been removed.
 source_set("common") {
   sources = [
+    "manifest_update_manager.cc",
+    "manifest_update_manager.h",
+    "manifest_update_task.cc",
+    "manifest_update_task.h",
     "web_app_tab_helper.cc",
     "web_app_tab_helper.h",
   ]
 
   deps = [
     ":web_app_group",
+    "//base/util/values:values_util",
     "//chrome/browser/web_applications/components",
     "//chrome/common",
+    "//components/content_settings/core/browser",
     "//content/public/browser",
     "//skia",
   ]
@@ -216,6 +222,23 @@ source_set("web_applications_browser_tests") {
   ]
 }
 
+source_set("common_browser_tests") {
+  testonly = true
+
+  sources = [ "manifest_update_manager_browsertest.cc" ]
+
+  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+
+  deps = [
+    ":common",
+    ":web_applications_test_support",
+    "//chrome/app:command_ids",
+    "//chrome/browser/web_applications/components",
+    "//chrome/test:test_support",
+    "//chrome/test:test_support_ui",
+  ]
+}
+
 # TODO(crbug.com/877898): Erase this and move WebAppProvider into
 # web_applications set.
 source_set("web_applications_on_extensions") {
@@ -227,6 +250,7 @@ source_set("web_applications_on_extensions") {
   ]
 
   deps = [
+    ":common",
     ":web_app_group",
     ":web_applications",
     "//chrome/browser/web_applications/components",
@@ -277,6 +301,7 @@ group("browser_tests") {
   testonly = true
 
   deps = [
+    ":common_browser_tests",
     ":web_app_test_group",
     ":web_applications_browser_tests",
     "//chrome/browser/web_applications/components:browser_tests",

chrome/browser/web_applications/components/BUILD.gn

@@ -25,10 +25,6 @@ source_set("components") {
     "install_finalizer.h",
     "install_manager.cc",
     "install_manager.h",
-    "manifest_update_manager.cc",
-    "manifest_update_manager.h",
-    "manifest_update_task.cc",
-    "manifest_update_task.h",
     "pending_app_manager.cc",
     "pending_app_manager.h",
     "policy/web_app_policy_constants.cc",
@@ -107,7 +103,6 @@ source_set("components") {
   }
 
   deps = [
-    "//base/util/values:values_util",
     "//chrome/app/resources:platform_locale_settings",
     "//chrome/app/theme:chrome_unscaled_resources",
 
@@ -123,7 +118,6 @@ source_set("components") {
     "//chrome/browser/engagement:mojo_bindings",
     "//chrome/browser/web_applications:web_app_group",
     "//chrome/common",
-    "//components/content_settings/core/browser",
     "//components/crx_file",
     "//components/keyed_service/content",
     "//components/pref_registry",
@@ -188,16 +182,12 @@ source_set("unit_tests") {
 source_set("browser_tests") {
   testonly = true
 
-  sources = [
-    "manifest_update_manager_browsertest.cc",
-    "web_app_url_loader_browsertest.cc",
-  ]
+  sources = [ "web_app_url_loader_browsertest.cc" ]
 
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
   deps = [
     ":components",
-    "//chrome/app:command_ids",
     "//chrome/browser/web_applications:web_applications_test_support",
     "//chrome/test:test_support",
     "//chrome/test:test_support_ui",

chrome/browser/web_applications/components/manifest_update_manager.cc → chrome/browser/web_applications/manifest_update_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/web_applications/components/manifest_update_manager.h"
+#include "chrome/browser/web_applications/manifest_update_manager.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/util/values/values_util.h"

chrome/browser/web_applications/components/manifest_update_manager.h → chrome/browser/web_applications/manifest_update_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_WEB_APPLICATIONS_COMPONENTS_MANIFEST_UPDATE_MANAGER_H_
-#define CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_MANIFEST_UPDATE_MANAGER_H_
+#ifndef CHROME_BROWSER_WEB_APPLICATIONS_MANIFEST_UPDATE_MANAGER_H_
+#define CHROME_BROWSER_WEB_APPLICATIONS_MANIFEST_UPDATE_MANAGER_H_
 
 #include <memory>
 
@@ -14,8 +14,8 @@
 #include "base/time/time.h"
 #include "chrome/browser/web_applications/components/app_registrar.h"
 #include "chrome/browser/web_applications/components/app_registrar_observer.h"
-#include "chrome/browser/web_applications/components/manifest_update_task.h"
 #include "chrome/browser/web_applications/components/web_app_helpers.h"
+#include "chrome/browser/web_applications/manifest_update_task.h"
 
 class Profile;
 
@@ -92,4 +92,4 @@ class ManifestUpdateManager final : public AppRegistrarObserver {
 
 }  // namespace web_app
 
-#endif  // CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_MANIFEST_UPDATE_MANAGER_H_
+#endif  // CHROME_BROWSER_WEB_APPLICATIONS_MANIFEST_UPDATE_MANAGER_H_

chrome/browser/web_applications/components/manifest_update_manager_browsertest.cc → chrome/browser/web_applications/manifest_update_manager_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/web_applications/components/manifest_update_manager.h"
+#include "chrome/browser/web_applications/manifest_update_manager.h"
 
 #include <string>
 #include <vector>

chrome/browser/web_applications/components/manifest_update_task.cc → chrome/browser/web_applications/manifest_update_task.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/web_applications/components/manifest_update_task.h"
+#include "chrome/browser/web_applications/manifest_update_task.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/installable/installable_manager.h"

chrome/browser/web_applications/components/manifest_update_task.h → chrome/browser/web_applications/manifest_update_task.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_WEB_APPLICATIONS_COMPONENTS_MANIFEST_UPDATE_TASK_H_
-#define CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_MANIFEST_UPDATE_TASK_H_
+#ifndef CHROME_BROWSER_WEB_APPLICATIONS_MANIFEST_UPDATE_TASK_H_
+#define CHROME_BROWSER_WEB_APPLICATIONS_MANIFEST_UPDATE_TASK_H_
 
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
@@ -97,4 +97,4 @@ class ManifestUpdateTask final
 
 }  // namespace web_app
 
-#endif  // CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_MANIFEST_UPDATE_TASK_H_
+#endif  // CHROME_BROWSER_WEB_APPLICATIONS_MANIFEST_UPDATE_TASK_H_

chrome/browser/web_applications/web_app_provider.cc

@@ -11,7 +11,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/components/externally_installed_web_app_prefs.h"
 #include "chrome/browser/web_applications/components/install_bounce_metric.h"
-#include "chrome/browser/web_applications/components/manifest_update_manager.h"
 #include "chrome/browser/web_applications/components/policy/web_app_policy_manager.h"
 #include "chrome/browser/web_applications/components/web_app_audio_focus_id_map.h"
 #include "chrome/browser/web_applications/components/web_app_prefs_utils.h"
@@ -25,6 +24,7 @@
 #include "chrome/browser/web_applications/extensions/bookmark_app_shortcut_manager.h"
 #include "chrome/browser/web_applications/external_web_app_manager.h"
 #include "chrome/browser/web_applications/file_utils_wrapper.h"
+#include "chrome/browser/web_applications/manifest_update_manager.h"
 #include "chrome/browser/web_applications/pending_app_manager_impl.h"
 #include "chrome/browser/web_applications/system_web_app_manager.h"
 #include "chrome/browser/web_applications/web_app_database_factory.h"

chrome/browser/web_applications/web_app_tab_helper.cc

@@ -6,11 +6,11 @@
 
 #include "base/unguessable_token.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/web_applications/components/manifest_update_manager.h"
 #include "chrome/browser/web_applications/components/policy/web_app_policy_manager.h"
 #include "chrome/browser/web_applications/components/web_app_audio_focus_id_map.h"
 #include "chrome/browser/web_applications/components/web_app_provider_base.h"
 #include "chrome/browser/web_applications/components/web_app_ui_manager.h"
+#include "chrome/browser/web_applications/manifest_update_manager.h"
 #include "content/public/browser/media_session.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/site_instance.h"