[Extensions] s/SharedUserScriptManager/ExtensionUserScriptManager

declarative extension user scripts (from RequestContentScript/dynamic
content scripts API/webview) will all be moved into
ExtensionUserScriptManager.

This rename is the first step of that process.

Bug: 1168627
Change-Id: I4e69dde79210bc87d13fb620106fd513082a7f16
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639867Reviewed-by: Sean Topping <seantopping@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Kelvin Jiang <kelvinjiang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845463}

chrome/browser/extensions/chrome_test_extension_loader.cc

@@ -23,9 +23,9 @@
 #include "extensions/browser/extension_creator.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_user_script_manager.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/notification_types.h"
-#include "extensions/browser/shared_user_script_manager.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/browser/user_script_loader.h"
 #include "extensions/common/manifest_handlers/background_info.h"
@@ -160,8 +160,8 @@ scoped_refptr<const Extension> ChromeTestExtensionLoader::LoadExtension(
 
 bool ChromeTestExtensionLoader::WaitForExtensionReady(
     const Extension& extension) {
-  SharedUserScriptManager* user_script_manager =
-      ExtensionSystem::Get(browser_context_)->shared_user_script_manager();
+  ExtensionUserScriptManager* user_script_manager =
+      ExtensionSystem::Get(browser_context_)->extension_user_script_manager();
   // Note: |user_script_manager| can be null in tests.
   if (user_script_manager &&
       !ContentScriptsInfo::GetContentScripts(&extension).empty()) {

chrome/browser/extensions/chrome_test_extension_loader_browsertest.cc

@@ -14,7 +14,7 @@
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/shared_user_script_manager.h"
+#include "extensions/browser/extension_user_script_manager.h"
 #include "extensions/browser/user_script_loader.h"
 #include "extensions/common/host_id.h"
 #include "extensions/test/test_extension_dir.h"
@@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(ChromeTestExtensionLoaderUnitTest,
 
   ExtensionSystem* extension_system = ExtensionSystem::Get(profile());
   EXPECT_TRUE(
-      extension_system->shared_user_script_manager()
+      extension_system->extension_user_script_manager()
           ->script_loader()
           ->HasLoadedScripts(HostID(HostID::EXTENSIONS, extension->id())));
 

chrome/browser/extensions/extension_startup_browsertest.cc

@@ -38,7 +38,7 @@
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/shared_user_script_manager.h"
+#include "extensions/browser/extension_user_script_manager.h"
 #include "extensions/browser/user_script_loader.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
@@ -155,9 +155,9 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
     content::WindowedNotificationObserver user_scripts_observer(
         extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,
         content::NotificationService::AllSources());
-    extensions::SharedUserScriptManager* manager =
+    extensions::ExtensionUserScriptManager* manager =
         extensions::ExtensionSystem::Get(browser()->profile())
-            ->shared_user_script_manager();
+            ->extension_user_script_manager();
     if (!manager->script_loader()->initial_load_complete())
       user_scripts_observer.Wait();
     ASSERT_TRUE(manager->script_loader()->initial_load_complete());

chrome/browser/extensions/extension_system_impl.cc

@@ -50,12 +50,12 @@
 #include "extensions/browser/extension_pref_value_map_factory.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_user_script_manager.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/browser/service_worker_manager.h"
-#include "extensions/browser/shared_user_script_manager.h"
 #include "extensions/browser/state_store.h"
 #include "extensions/browser/uninstall_ping_sender.h"
 #include "extensions/browser/value_store/value_store_factory_impl.h"
@@ -201,8 +201,8 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
 
   service_worker_manager_.reset(new ServiceWorkerManager(profile_));
 
-  shared_user_script_manager_ =
-      std::make_unique<SharedUserScriptManager>(profile_);
+  extension_user_script_manager_ =
+      std::make_unique<ExtensionUserScriptManager>(profile_);
 
   // ExtensionService depends on RuntimeData.
   runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
@@ -334,9 +334,9 @@ ManagementPolicy* ExtensionSystemImpl::Shared::management_policy() {
   return management_policy_.get();
 }
 
-SharedUserScriptManager*
-ExtensionSystemImpl::Shared::shared_user_script_manager() {
-  return shared_user_script_manager_.get();
+ExtensionUserScriptManager*
+ExtensionSystemImpl::Shared::extension_user_script_manager() {
+  return extension_user_script_manager_.get();
 }
 
 InfoMap* ExtensionSystemImpl::Shared::info_map() {
@@ -379,7 +379,7 @@ void ExtensionSystemImpl::Shutdown() {
 void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
   TRACE_EVENT0("browser,startup", "ExtensionSystemImpl::InitForRegularProfile");
 
-  if (shared_user_script_manager() || extension_service())
+  if (extension_user_script_manager() || extension_service())
     return;  // Already initialized.
 
   // The InfoMap needs to be created before the ProcessManager.
@@ -403,8 +403,9 @@ ServiceWorkerManager* ExtensionSystemImpl::service_worker_manager() {
   return shared_->service_worker_manager();
 }
 
-SharedUserScriptManager* ExtensionSystemImpl::shared_user_script_manager() {
-  return shared_->shared_user_script_manager();
+ExtensionUserScriptManager*
+ExtensionSystemImpl::extension_user_script_manager() {
+  return shared_->extension_user_script_manager();
 }
 
 StateStore* ExtensionSystemImpl::state_store() {

chrome/browser/extensions/extension_system_impl.h

@@ -55,7 +55,8 @@ class ExtensionSystemImpl : public ExtensionSystem {
   RuntimeData* runtime_data() override;            // shared
   ManagementPolicy* management_policy() override;  // shared
   ServiceWorkerManager* service_worker_manager() override;  // shared
-  SharedUserScriptManager* shared_user_script_manager() override;  // shared
+  ExtensionUserScriptManager* extension_user_script_manager()
+      override;                                                    // shared
   StateStore* state_store() override;                              // shared
   StateStore* rules_store() override;                              // shared
   scoped_refptr<ValueStoreFactory> store_factory() override;       // shared
@@ -114,7 +115,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     RuntimeData* runtime_data();
     ManagementPolicy* management_policy();
     ServiceWorkerManager* service_worker_manager();
-    SharedUserScriptManager* shared_user_script_manager();
+    ExtensionUserScriptManager* extension_user_script_manager();
     InfoMap* info_map();
     QuotaService* quota_service();
     AppSorting* app_sorting();
@@ -136,7 +137,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     std::unique_ptr<ServiceWorkerManager> service_worker_manager_;
     // Shared memory region manager for scripts statically declared in extension
     // manifests. This region is shared between all extensions.
-    std::unique_ptr<SharedUserScriptManager> shared_user_script_manager_;
+    std::unique_ptr<ExtensionUserScriptManager> extension_user_script_manager_;
     std::unique_ptr<RuntimeData> runtime_data_;
     // ExtensionService depends on StateStore, Blocklist and RuntimeData.
     std::unique_ptr<ExtensionService> extension_service_;

chrome/browser/extensions/test_extension_system.cc

@@ -109,7 +109,8 @@ ServiceWorkerManager* TestExtensionSystem::service_worker_manager() {
   return nullptr;
 }
 
-SharedUserScriptManager* TestExtensionSystem::shared_user_script_manager() {
+ExtensionUserScriptManager*
+TestExtensionSystem::extension_user_script_manager() {
   return nullptr;
 }
 

chrome/browser/extensions/test_extension_system.h

@@ -58,7 +58,7 @@ class TestExtensionSystem : public ExtensionSystem {
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   ServiceWorkerManager* service_worker_manager() override;
-  SharedUserScriptManager* shared_user_script_manager() override;
+  ExtensionUserScriptManager* extension_user_script_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   scoped_refptr<ValueStoreFactory> store_factory() override;

chrome/browser/extensions/user_script_listener.cc

@@ -16,7 +16,7 @@
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/shared_user_script_manager.h"
+#include "extensions/browser/extension_user_script_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/content_scripts_handler.h"
 #include "extensions/common/url_pattern.h"
@@ -203,8 +203,8 @@ void UserScriptListener::Observe(int type,
       DCHECK(!extension_registry_observer_.IsObserving(registry));
       extension_registry_observer_.Add(registry);
 
-      SharedUserScriptManager* user_script_manager =
-          ExtensionSystem::Get(profile)->shared_user_script_manager();
+      ExtensionUserScriptManager* user_script_manager =
+          ExtensionSystem::Get(profile)->extension_user_script_manager();
       // Note: |user_script_manager| can be null in some tests.
       if (user_script_manager) {
         UserScriptLoader* loader = user_script_manager->script_loader();

chromecast/browser/extensions/cast_extension_system.cc

@@ -19,6 +19,7 @@
 #include "extensions/browser/api/app_runtime/app_runtime_api.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_user_script_manager.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/null_app_sorting.h"
 #include "extensions/browser/process_manager.h"
@@ -26,7 +27,6 @@
 #include "extensions/browser/renderer_startup_helper.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/browser/service_worker_manager.h"
-#include "extensions/browser/shared_user_script_manager.h"
 #include "extensions/browser/unloaded_extension_reason.h"
 #include "extensions/browser/value_store/value_store_factory_impl.h"
 #include "extensions/common/api/app_runtime.h"
@@ -186,8 +186,8 @@ void CastExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
 
   RendererStartupHelperFactory::GetForBrowserContext(browser_context_);
 
-  shared_user_script_manager_ =
-      std::make_unique<SharedUserScriptManager>(browser_context_);
+  extension_user_script_manager_ =
+      std::make_unique<ExtensionUserScriptManager>(browser_context_);
 
   extension_registrar_ =
       std::make_unique<ExtensionRegistrar>(browser_context_, this);
@@ -209,8 +209,9 @@ ServiceWorkerManager* CastExtensionSystem::service_worker_manager() {
   return service_worker_manager_.get();
 }
 
-SharedUserScriptManager* CastExtensionSystem::shared_user_script_manager() {
-  return shared_user_script_manager_.get();
+ExtensionUserScriptManager*
+CastExtensionSystem::extension_user_script_manager() {
+  return extension_user_script_manager_.get();
 }
 
 StateStore* CastExtensionSystem::state_store() {

chromecast/browser/extensions/cast_extension_system.h

@@ -68,7 +68,7 @@ class CastExtensionSystem : public ExtensionSystem,
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   ServiceWorkerManager* service_worker_manager() override;
-  SharedUserScriptManager* shared_user_script_manager() override;
+  ExtensionUserScriptManager* extension_user_script_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   scoped_refptr<ValueStoreFactory> store_factory() override;
@@ -124,7 +124,7 @@ class CastExtensionSystem : public ExtensionSystem,
   std::unique_ptr<RuntimeData> runtime_data_;
   std::unique_ptr<QuotaService> quota_service_;
   std::unique_ptr<AppSorting> app_sorting_;
-  std::unique_ptr<SharedUserScriptManager> shared_user_script_manager_;
+  std::unique_ptr<ExtensionUserScriptManager> extension_user_script_manager_;
   std::unique_ptr<ExtensionRegistrar> extension_registrar_;
 
   scoped_refptr<ValueStoreFactory> store_factory_;

extensions/browser/BUILD.gn

@@ -193,6 +193,8 @@ source_set("browser_sources") {
     "extension_system_provider.h",
     "extension_user_script_loader.cc",
     "extension_user_script_loader.h",
+    "extension_user_script_manager.cc",
+    "extension_user_script_manager.h",
     "extension_util.cc",
     "extension_util.h",
     "extension_web_contents_observer.cc",
@@ -341,8 +343,6 @@ source_set("browser_sources") {
     "service_worker_task_queue.h",
     "service_worker_task_queue_factory.cc",
     "service_worker_task_queue_factory.h",
-    "shared_user_script_manager.cc",
-    "shared_user_script_manager.h",
     "state_store.cc",
     "state_store.h",
     "suggest_permission_util.cc",

extensions/browser/extension_system.h

@@ -40,7 +40,7 @@ class ManagementPolicy;
 class QuotaService;
 class RuntimeData;
 class ServiceWorkerManager;
-class SharedUserScriptManager;
+class ExtensionUserScriptManager;
 class StateStore;
 class ValueStoreFactory;
 enum class UnloadedExtensionReason;
@@ -85,8 +85,8 @@ class ExtensionSystem : public KeyedService {
   // The ServiceWorkerManager is created at startup.
   virtual ServiceWorkerManager* service_worker_manager() = 0;
 
-  // The SharedUserScriptManager is created at startup.
-  virtual SharedUserScriptManager* shared_user_script_manager() = 0;
+  // The ExtensionUserScriptManager is created at startup.
+  virtual ExtensionUserScriptManager* extension_user_script_manager() = 0;
 
   // The StateStore is created at startup.
   virtual StateStore* state_store() = 0;

extensions/browser/extension_user_script_loader.h

@@ -32,7 +32,7 @@ class ExtensionUserScriptLoader : public UserScriptLoader,
   using HostsInfo = std::map<HostID, PathAndLocaleInfo>;
 
   // The listen_for_extension_system_loaded is only set true when initializing
-  // the Extension System, e.g, when constructs SharedUserScriptManager in
+  // the Extension System, e.g, when constructs ExtensionUserScriptManager in
   // ExtensionSystemImpl.
   ExtensionUserScriptLoader(content::BrowserContext* browser_context,
                             const HostID& host_id,

extensions/browser/shared_user_script_manager.cc → extensions/browser/extension_user_script_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 "extensions/browser/shared_user_script_manager.h"
+#include "extensions/browser/extension_user_script_manager.h"
 
 #include "extensions/browser/extension_util.h"
 #include "extensions/common/host_id.h"
@@ -10,7 +10,7 @@
 
 namespace extensions {
 
-SharedUserScriptManager::SharedUserScriptManager(
+ExtensionUserScriptManager::ExtensionUserScriptManager(
     content::BrowserContext* browser_context)
     : loader_(browser_context,
               HostID(),
@@ -19,15 +19,15 @@ SharedUserScriptManager::SharedUserScriptManager(
   extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
 
-SharedUserScriptManager::~SharedUserScriptManager() {}
+ExtensionUserScriptManager::~ExtensionUserScriptManager() {}
 
-void SharedUserScriptManager::OnExtensionLoaded(
+void ExtensionUserScriptManager::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const Extension* extension) {
   loader_.AddScripts(GetScriptsMetadata(extension));
 }
 
-void SharedUserScriptManager::OnExtensionUnloaded(
+void ExtensionUserScriptManager::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionReason reason) {
@@ -39,7 +39,7 @@ void SharedUserScriptManager::OnExtensionUnloaded(
   loader_.RemoveScripts(scripts_to_remove);
 }
 
-std::unique_ptr<UserScriptList> SharedUserScriptManager::GetScriptsMetadata(
+std::unique_ptr<UserScriptList> ExtensionUserScriptManager::GetScriptsMetadata(
     const Extension* extension) {
   bool incognito_enabled =
       util::IsIncognitoEnabled(extension->id(), browser_context_);

extensions/browser/shared_user_script_manager.h → extensions/browser/extension_user_script_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 EXTENSIONS_BROWSER_SHARED_USER_SCRIPT_MANAGER_H_
-#define EXTENSIONS_BROWSER_SHARED_USER_SCRIPT_MANAGER_H_
+#ifndef EXTENSIONS_BROWSER_EXTENSION_USER_SCRIPT_MANAGER_H_
+#define EXTENSIONS_BROWSER_EXTENSION_USER_SCRIPT_MANAGER_H_
 
 #include <memory>
 #include <set>
@@ -25,10 +25,12 @@ namespace extensions {
 // Manages statically-defined user scripts for all extensions. Owns a
 // UserScriptLoader to which file loading and shared memory management
 // operations are delegated.
-class SharedUserScriptManager : public ExtensionRegistryObserver {
+// TODO(crbug.com/1168627): Manage declarative user scripts (from API/webview)
+// from all extensions in this class.
+class ExtensionUserScriptManager : public ExtensionRegistryObserver {
  public:
-  explicit SharedUserScriptManager(content::BrowserContext* browser_context);
-  ~SharedUserScriptManager() override;
+  explicit ExtensionUserScriptManager(content::BrowserContext* browser_context);
+  ~ExtensionUserScriptManager() override;
 
   UserScriptLoader* script_loader() { return &loader_; }
 
@@ -54,9 +56,9 @@ class SharedUserScriptManager : public ExtensionRegistryObserver {
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_{this};
 
-  DISALLOW_COPY_AND_ASSIGN(SharedUserScriptManager);
+  DISALLOW_COPY_AND_ASSIGN(ExtensionUserScriptManager);
 };
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_BROWSER_SHARED_USER_SCRIPT_MANAGER_H_
+#endif  // EXTENSIONS_BROWSER_EXTENSION_USER_SCRIPT_MANAGER_H_

extensions/browser/mock_extension_system.cc

@@ -37,7 +37,8 @@ ServiceWorkerManager* MockExtensionSystem::service_worker_manager() {
   return nullptr;
 }
 
-SharedUserScriptManager* MockExtensionSystem::shared_user_script_manager() {
+ExtensionUserScriptManager*
+MockExtensionSystem::extension_user_script_manager() {
   return nullptr;
 }
 

extensions/browser/mock_extension_system.h

@@ -36,7 +36,7 @@ class MockExtensionSystem : public ExtensionSystem {
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   ServiceWorkerManager* service_worker_manager() override;
-  SharedUserScriptManager* shared_user_script_manager() override;
+  ExtensionUserScriptManager* extension_user_script_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   scoped_refptr<ValueStoreFactory> store_factory() override;

extensions/shell/browser/shell_extension_system.cc

@@ -95,7 +95,8 @@ ServiceWorkerManager* ShellExtensionSystem::service_worker_manager() {
   return service_worker_manager_.get();
 }
 
-SharedUserScriptManager* ShellExtensionSystem::shared_user_script_manager() {
+ExtensionUserScriptManager*
+ShellExtensionSystem::extension_user_script_manager() {
   return nullptr;
 }
 

extensions/shell/browser/shell_extension_system.h

@@ -64,7 +64,7 @@ class ShellExtensionSystem : public ExtensionSystem {
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   ServiceWorkerManager* service_worker_manager() override;
-  SharedUserScriptManager* shared_user_script_manager() override;
+  ExtensionUserScriptManager* extension_user_script_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   scoped_refptr<ValueStoreFactory> store_factory() override;