Introduce DeclarativeUserScriptManager.

chrome/browser/extensions/extension_system_impl.cc

Index: chrome/browser/extensions/extension_system_impl.cc
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 05931aad12f17438bfc03231b1bb111c400d5c59..38866766cd9d307ab1568e54e85258b0cf2dc7c0 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/component_loader.h"
-#include "chrome/browser/extensions/declarative_user_script_master.h"
+#include "chrome/browser/extensions/declarative_user_script_manager.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_management.h"
@@ -302,6 +302,8 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   ExtensionErrorReporter::Init(allow_noisy_errors);
 
   shared_user_script_master_.reset(new SharedUserScriptMaster(profile_));
+  declarative_user_script_manager_.reset(
+      new DeclarativeUserScriptManager(profile_));
 
   // ExtensionService depends on RuntimeData.
   runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
@@ -431,6 +433,11 @@ ExtensionSystemImpl::Shared::shared_user_script_master() {
   return shared_user_script_master_.get();
 }
 
+DeclarativeUserScriptManager*
+ExtensionSystemImpl::Shared::declarative_user_script_manager() {
+  return declarative_user_script_manager_.get();
+}
+
 InfoMap* ExtensionSystemImpl::Shared::info_map() {
   if (!extension_info_map_.get())
     extension_info_map_ = new InfoMap();
@@ -462,27 +469,6 @@ ContentVerifier* ExtensionSystemImpl::Shared::content_verifier() {
   return content_verifier_.get();
 }
 
-DeclarativeUserScriptMaster*
-ExtensionSystemImpl::Shared::GetDeclarativeUserScriptMasterByExtension(
-    const ExtensionId& extension_id) {
-  DCHECK(ready().is_signaled());
-  DeclarativeUserScriptMaster* master = NULL;
-  for (ScopedVector<DeclarativeUserScriptMaster>::iterator it =
-           declarative_user_script_masters_.begin();
-       it != declarative_user_script_masters_.end();
-       ++it) {
-    if ((*it)->extension_id() == extension_id) {
-      master = *it;
-      break;
-    }
-  }
-  if (!master) {
-    master = new DeclarativeUserScriptMaster(profile_, extension_id);
-    declarative_user_script_masters_.push_back(master);
-  }
-  return master;
-}
-
 //
 // ExtensionSystemImpl
 //
@@ -528,6 +514,11 @@ SharedUserScriptMaster* ExtensionSystemImpl::shared_user_script_master() {
   return shared_->shared_user_script_master();
 }
 
+DeclarativeUserScriptManager*
+ExtensionSystemImpl::declarative_user_script_manager() {
+  return shared_->declarative_user_script_manager();
+}
+
 StateStore* ExtensionSystemImpl::state_store() {
   return shared_->state_store();
 }
@@ -572,12 +563,6 @@ scoped_ptr<ExtensionSet> ExtensionSystemImpl::GetDependentExtensions(
       extension);
 }
 
-DeclarativeUserScriptMaster*
-ExtensionSystemImpl::GetDeclarativeUserScriptMasterByExtension(
-    const ExtensionId& extension_id) {
-  return shared_->GetDeclarativeUserScriptMasterByExtension(extension_id);
-}
-
 void ExtensionSystemImpl::RegisterExtensionWithRequestContexts(
     const Extension* extension) {
   base::Time install_time;