Refactoring: de-couple Extensions from "script injection System" [render side]:3

extensions/renderer/user_script_set_manager.cc

 // Copyright 2014 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 "extensions/renderer/user_script_set_manager.h"
 
 #include "components/crx_file/id_util.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/renderer/dispatcher.h"
+#include "extensions/renderer/injection_host.h"
 #include "extensions/renderer/script_injection.h"
 #include "extensions/renderer/user_script_set.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 
 namespace extensions {
 
 UserScriptSetManager::UserScriptSetManager(const ExtensionSet* extensions)
     : static_scripts_(extensions), extensions_(extensions) {
@@ skipping 10 matching lines @@
 void UserScriptSetManager::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 scoped_ptr<ScriptInjection>
 UserScriptSetManager::GetInjectionForDeclarativeScript(
     int script_id,
     blink::WebFrame* web_frame,
     int tab_id,
     const GURL& url,
-    const Extension* extension) {
+    const InjectionHost* injection_host) {
   UserScriptSet* user_script_set =
-      GetProgrammaticScriptsByExtension(extension->id());
+      GetProgrammaticScriptsByExtension(injection_host->id().id());
   if (!user_script_set)
     return scoped_ptr<ScriptInjection>();
 
   return user_script_set->GetDeclarativeScriptInjection(
       script_id,
       web_frame,
       tab_id,
       UserScript::BROWSER_DRIVEN,
       url,
-      extension);
+      injection_host);
 }
 
 bool UserScriptSetManager::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(UserScriptSetManager, message)
     IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateUserScripts, OnUpdateUserScripts)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ skipping 85 matching lines @@
 
   if (scripts->UpdateUserScripts(shared_memory, *effective_extensions)) {
     FOR_EACH_OBSERVER(
         Observer,
         observers_,
         OnUserScriptsUpdated(*effective_extensions, scripts->scripts()));
   }
 }
 
 }  // namespace extensions