Make DeclarativeUserScriptManager non-shared between profiles.

chrome/browser/extensions/api/declarative_content/content_action.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/declarative_content/content_action.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_content/content_constants.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/declarative_user_script_manager.h"
+#include "extensions/browser/declarative_user_script_manager_factory.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace extensions {
 
 namespace keys = declarative_content_constants;
 
 namespace {
@@ skipping 311 matching lines @@
   return true;
 }
 
 RequestContentScript::RequestContentScript(
     content::BrowserContext* browser_context,
     const Extension* extension,
     const ScriptData& script_data) {
   HostID host_id(HostID::EXTENSIONS, extension->id());
   InitScript(host_id, extension, script_data);
 
-  master_ = ExtensionSystem::Get(browser_context)
-                ->declarative_user_script_manager()
-                ->GetDeclarativeUserScriptMasterByID(host_id);
+  master_ = DeclarativeUserScriptManagerFactory::GetForBrowserContext(
+                browser_context)->GetDeclarativeUserScriptMasterByID(host_id);
   AddScript();
 }
 
 RequestContentScript::RequestContentScript(
     DeclarativeUserScriptMaster* master,
     const Extension* extension,
     const ScriptData& script_data) {
   HostID host_id(HostID::EXTENSIONS, extension->id());
   InitScript(host_id, extension, script_data);
 
@@ skipping 130 matching lines @@
                              bool* bad_message,
                              const base::DictionaryValue** action_dict,
                              std::string* instance_type) {
   INPUT_FORMAT_VALIDATE(json_action.GetAsDictionary(action_dict));
   INPUT_FORMAT_VALIDATE(
       (*action_dict)->GetString(keys::kInstanceType, instance_type));
   return true;
 }
 
 }  // namespace extensions