extensions: Rename SharedUserScriptMaster to SharedUserScriptManager

This change removes the uninclusive term "master" from the name of this
class. This is a better name anyways due to the symmetry with the
DeclarativeUserScriptManager class.

Bug: 1097189
Change-Id: Ie7bd46087103b30d52a32b397eda2a1097d99316
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2258357
Auto-Submit: Reilly Grant <reillyg@chromium.org>
Commit-Queue: Sean Topping <seantopping@chromium.org>
Reviewed-by: Sean Topping <seantopping@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781150}

chrome/browser/extensions/chrome_test_extension_loader.cc

@@ -25,7 +25,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/notification_types.h"
-#include "extensions/browser/shared_user_script_master.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"
@@ -147,12 +147,12 @@ scoped_refptr<const Extension> ChromeTestExtensionLoader::LoadExtension(
 
 bool ChromeTestExtensionLoader::WaitForExtensionReady(
     const Extension& extension) {
-  SharedUserScriptMaster* user_script_master =
-      ExtensionSystem::Get(browser_context_)->shared_user_script_master();
-  // Note: |user_script_master| can be null in tests.
-  if (user_script_master &&
+  SharedUserScriptManager* user_script_manager =
+      ExtensionSystem::Get(browser_context_)->shared_user_script_manager();
+  // Note: |user_script_manager| can be null in tests.
+  if (user_script_manager &&
       !ContentScriptsInfo::GetContentScripts(&extension).empty()) {
-    UserScriptLoader* user_script_loader = user_script_master->script_loader();
+    UserScriptLoader* user_script_loader = user_script_manager->script_loader();
     HostID host_id(HostID::EXTENSIONS, extension_id_);
     if (!user_script_loader->HasLoadedScripts(host_id))
       ContentScriptLoadWaiter(user_script_loader, host_id).Wait();

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_master.h"
+#include "extensions/browser/shared_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_master()
+      extension_system->shared_user_script_manager()
           ->script_loader()
           ->HasLoadedScripts(HostID(HostID::EXTENSIONS, extension->id())));
 

chrome/browser/extensions/extension_startup_browsertest.cc

@@ -37,7 +37,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_master.h"
+#include "extensions/browser/shared_user_script_manager.h"
 #include "extensions/browser/user_script_loader.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
@@ -154,12 +154,12 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
     content::WindowedNotificationObserver user_scripts_observer(
         extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,
         content::NotificationService::AllSources());
-    extensions::SharedUserScriptMaster* master =
+    extensions::SharedUserScriptManager* manager =
         extensions::ExtensionSystem::Get(browser()->profile())
-            ->shared_user_script_master();
-    if (!master->script_loader()->initial_load_complete())
+            ->shared_user_script_manager();
+    if (!manager->script_loader()->initial_load_complete())
       user_scripts_observer.Wait();
-    ASSERT_TRUE(master->script_loader()->initial_load_complete());
+    ASSERT_TRUE(manager->script_loader()->initial_load_complete());
   }
 
   void TestInjection(bool expect_css, bool expect_script) {

chrome/browser/extensions/extension_system_impl.cc

@@ -54,7 +54,7 @@
 #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_master.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"
@@ -197,7 +197,8 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
 
   service_worker_manager_.reset(new ServiceWorkerManager(profile_));
 
-  shared_user_script_master_.reset(new SharedUserScriptMaster(profile_));
+  shared_user_script_manager_ =
+      std::make_unique<SharedUserScriptManager>(profile_);
 
   // ExtensionService depends on RuntimeData.
   runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
@@ -332,9 +333,9 @@ ManagementPolicy* ExtensionSystemImpl::Shared::management_policy() {
   return management_policy_.get();
 }
 
-SharedUserScriptMaster*
-ExtensionSystemImpl::Shared::shared_user_script_master() {
-  return shared_user_script_master_.get();
+SharedUserScriptManager*
+ExtensionSystemImpl::Shared::shared_user_script_manager() {
+  return shared_user_script_manager_.get();
 }
 
 InfoMap* ExtensionSystemImpl::Shared::info_map() {
@@ -377,7 +378,7 @@ void ExtensionSystemImpl::Shutdown() {
 void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
   TRACE_EVENT0("browser,startup", "ExtensionSystemImpl::InitForRegularProfile");
 
-  if (shared_user_script_master() || extension_service())
+  if (shared_user_script_manager() || extension_service())
     return;  // Already initialized.
 
   // The InfoMap needs to be created before the ProcessManager.
@@ -401,8 +402,8 @@ ServiceWorkerManager* ExtensionSystemImpl::service_worker_manager() {
   return shared_->service_worker_manager();
 }
 
-SharedUserScriptMaster* ExtensionSystemImpl::shared_user_script_master() {
-  return shared_->shared_user_script_master();
+SharedUserScriptManager* ExtensionSystemImpl::shared_user_script_manager() {
+  return shared_->shared_user_script_manager();
 }
 
 StateStore* ExtensionSystemImpl::state_store() {

chrome/browser/extensions/extension_system_impl.h

@@ -54,7 +54,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
   RuntimeData* runtime_data() override;            // shared
   ManagementPolicy* management_policy() override;  // shared
   ServiceWorkerManager* service_worker_manager() override;  // shared
-  SharedUserScriptMaster* shared_user_script_master() override;  // shared
+  SharedUserScriptManager* shared_user_script_manager() override;  // shared
   StateStore* state_store() override;                              // shared
   StateStore* rules_store() override;                              // shared
   scoped_refptr<ValueStoreFactory> store_factory() override;       // shared
@@ -113,7 +113,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     RuntimeData* runtime_data();
     ManagementPolicy* management_policy();
     ServiceWorkerManager* service_worker_manager();
-    SharedUserScriptMaster* shared_user_script_master();
+    SharedUserScriptManager* shared_user_script_manager();
     InfoMap* info_map();
     QuotaService* quota_service();
     AppSorting* app_sorting();
@@ -135,7 +135,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<SharedUserScriptMaster> shared_user_script_master_;
+    std::unique_ptr<SharedUserScriptManager> shared_user_script_manager_;
     std::unique_ptr<RuntimeData> runtime_data_;
     // ExtensionService depends on StateStore, Blacklist and RuntimeData.
     std::unique_ptr<ExtensionService> extension_service_;

chrome/browser/extensions/test_extension_system.cc

@@ -106,8 +106,8 @@ ServiceWorkerManager* TestExtensionSystem::service_worker_manager() {
   return nullptr;
 }
 
-SharedUserScriptMaster* TestExtensionSystem::shared_user_script_master() {
-  return NULL;
+SharedUserScriptManager* TestExtensionSystem::shared_user_script_manager() {
+  return nullptr;
 }
 
 StateStore* TestExtensionSystem::state_store() {

chrome/browser/extensions/test_extension_system.h

@@ -57,7 +57,7 @@ class TestExtensionSystem : public ExtensionSystem {
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   ServiceWorkerManager* service_worker_manager() override;
-  SharedUserScriptMaster* shared_user_script_master() override;
+  SharedUserScriptManager* shared_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_master.h"
+#include "extensions/browser/shared_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,11 +203,11 @@ void UserScriptListener::Observe(int type,
       DCHECK(!extension_registry_observer_.IsObserving(registry));
       extension_registry_observer_.Add(registry);
 
-      SharedUserScriptMaster* user_script_master =
-          ExtensionSystem::Get(profile)->shared_user_script_master();
-      // Note: |user_script_master| can be null in some tests.
-      if (user_script_master) {
-        UserScriptLoader* loader = user_script_master->script_loader();
+      SharedUserScriptManager* user_script_manager =
+          ExtensionSystem::Get(profile)->shared_user_script_manager();
+      // Note: |user_script_manager| can be null in some tests.
+      if (user_script_manager) {
+        UserScriptLoader* loader = user_script_manager->script_loader();
         DCHECK(!user_script_loader_observer_.IsObserving(loader));
         user_script_loader_observer_.Add(loader);
       }

chromecast/browser/extensions/cast_extension_system.cc

@@ -26,7 +26,7 @@
 #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_master.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_master_ =
-      std::make_unique<SharedUserScriptMaster>(browser_context_);
+  shared_user_script_manager_ =
+      std::make_unique<SharedUserScriptManager>(browser_context_);
 
   extension_registrar_ =
       std::make_unique<ExtensionRegistrar>(browser_context_, this);
@@ -209,8 +209,8 @@ ServiceWorkerManager* CastExtensionSystem::service_worker_manager() {
   return service_worker_manager_.get();
 }
 
-SharedUserScriptMaster* CastExtensionSystem::shared_user_script_master() {
-  return shared_user_script_master_.get();
+SharedUserScriptManager* CastExtensionSystem::shared_user_script_manager() {
+  return shared_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;
-  SharedUserScriptMaster* shared_user_script_master() override;
+  SharedUserScriptManager* shared_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<SharedUserScriptMaster> shared_user_script_master_;
+  std::unique_ptr<SharedUserScriptManager> shared_user_script_manager_;
   std::unique_ptr<ExtensionRegistrar> extension_registrar_;
 
   scoped_refptr<ValueStoreFactory> store_factory_;

extensions/browser/BUILD.gn

@@ -329,8 +329,8 @@ jumbo_source_set("browser_sources") {
     "service_worker_task_queue.h",
     "service_worker_task_queue_factory.cc",
     "service_worker_task_queue_factory.h",
-    "shared_user_script_master.cc",
-    "shared_user_script_master.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 SharedUserScriptMaster;
+class SharedUserScriptManager;
 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 SharedUserScriptMaster is created at startup.
-  virtual SharedUserScriptMaster* shared_user_script_master() = 0;
+  // The SharedUserScriptManager is created at startup.
+  virtual SharedUserScriptManager* shared_user_script_manager() = 0;
 
   // The StateStore is created at startup.
   virtual StateStore* state_store() = 0;

extensions/browser/extension_user_script_loader.h

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

extensions/browser/mock_extension_system.cc

@@ -37,7 +37,7 @@ ServiceWorkerManager* MockExtensionSystem::service_worker_manager() {
   return nullptr;
 }
 
-SharedUserScriptMaster* MockExtensionSystem::shared_user_script_master() {
+SharedUserScriptManager* MockExtensionSystem::shared_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;
-  SharedUserScriptMaster* shared_user_script_master() override;
+  SharedUserScriptManager* shared_user_script_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   scoped_refptr<ValueStoreFactory> store_factory() override;

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

extensions/browser/shared_user_script_master.h → extensions/browser/shared_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_MASTER_H_
-#define EXTENSIONS_BROWSER_SHARED_USER_SCRIPT_MASTER_H_
+#ifndef EXTENSIONS_BROWSER_SHARED_USER_SCRIPT_MANAGER_H_
+#define EXTENSIONS_BROWSER_SHARED_USER_SCRIPT_MANAGER_H_
 
 #include <memory>
 #include <set>
@@ -25,10 +25,10 @@ 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 SharedUserScriptMaster : public ExtensionRegistryObserver {
+class SharedUserScriptManager : public ExtensionRegistryObserver {
  public:
-  explicit SharedUserScriptMaster(content::BrowserContext* browser_context);
-  ~SharedUserScriptMaster() override;
+  explicit SharedUserScriptManager(content::BrowserContext* browser_context);
+  ~SharedUserScriptManager() override;
 
   UserScriptLoader* script_loader() { return &loader_; }
 
@@ -54,9 +54,9 @@ class SharedUserScriptMaster : public ExtensionRegistryObserver {
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_{this};
 
-  DISALLOW_COPY_AND_ASSIGN(SharedUserScriptMaster);
+  DISALLOW_COPY_AND_ASSIGN(SharedUserScriptManager);
 };
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_BROWSER_SHARED_USER_SCRIPT_MASTER_H_
+#endif  // EXTENSIONS_BROWSER_SHARED_USER_SCRIPT_MANAGER_H_

extensions/browser/user_script_loader.h

@@ -36,7 +36,7 @@ namespace extensions {
 // renderers of new shared memory region when new renderers appear, or when
 // script reloading completes. Script loading lives on the UI thread. Instances
 // of this class are embedded within classes with names ending in
-// UserScriptMaster. These "master" classes implement the strategy for which
+// UserScriptManager. These "manager" classes implement the strategy for which
 // scripts to load/unload on this logical unit of scripts.
 class UserScriptLoader : public content::RenderProcessHostCreationObserver {
  public:

extensions/shell/browser/shell_extension_system.cc

@@ -95,7 +95,7 @@ ServiceWorkerManager* ShellExtensionSystem::service_worker_manager() {
   return service_worker_manager_.get();
 }
 
-SharedUserScriptMaster* ShellExtensionSystem::shared_user_script_master() {
+SharedUserScriptManager* ShellExtensionSystem::shared_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;
-  SharedUserScriptMaster* shared_user_script_master() override;
+  SharedUserScriptManager* shared_user_script_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   scoped_refptr<ValueStoreFactory> store_factory() override;