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

extensions/renderer/script_injection.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/script_injection.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
@@ skipping 95 matching lines @@
 }
 
 // static
 void ScriptInjection::RemoveIsolatedWorld(const std::string& host_id) {
   g_isolated_worlds.Get().erase(host_id);
 }
 
 ScriptInjection::ScriptInjection(
     scoped_ptr<ScriptInjector> injector,
     blink::WebLocalFrame* web_frame,
-    const HostID& host_id,
+    scoped_ptr<const InjectionHost> injection_host,
     const UserScript::ConsumerInstanceType& consumer_instance_type,
     UserScript::RunLocation run_location,
     int tab_id)
     : injector_(injector.Pass()),
       web_frame_(web_frame),
-      host_id_(host_id),
+      injection_host_(injection_host.Pass()),
       consumer_instance_type_(consumer_instance_type),
       run_location_(run_location),
       tab_id_(tab_id),
       request_id_(kInvalidRequestId),
       complete_(false) {
+  CHECK(injection_host_.get());
 }
 
 ScriptInjection::~ScriptInjection() {
   if (!complete_)
     injector_->OnWillNotInject(ScriptInjector::WONT_INJECT);
 }
 
 bool ScriptInjection::TryToInject(UserScript::RunLocation current_location,
                                   const InjectionHost* injection_host,
                                   ScriptsRunInfo* scripts_run_info) {
@@ skipping 30 matching lines @@
                                           ScriptsRunInfo* scripts_run_info) {
   if (!injection_host) {
     NotifyWillNotInject(ScriptInjector::EXTENSION_REMOVED);
     return false;
   }
 
   Inject(injection_host, scripts_run_info);
   return true;
 }
 
+const InjectionHost* ScriptInjection::GetInjectionHost() {
+  if (injection_host_->IsGone())

[Devlin, 2015/02/17 18:56:52]

This won't really work, because you never update the refptr when the extension
is removed.

[Xi Han, 2015/02/18 21:11:46]

As discussed offline, the Dispatcher will notify the ScriptInjectionManager to
update its pending injection list when any extension is unloaded.

+    return nullptr;
+  return injection_host_.get();
+}
+
 void ScriptInjection::RequestPermission() {
-  if (host_id_.type() != HostID::EXTENSIONS)
+  if (host_id().type() != HostID::EXTENSIONS)
     return;
 
   content::RenderView* render_view =
       content::RenderView::FromWebView(web_frame()->top()->view());
 
   // If we are just notifying the browser of the injection, then send an
   // invalid request (which is treated like a notification).
   request_id_ = consumer_instance_type_ ==
       UserScript::ConsumerInstanceType::WEBVIEW ||
       ShouldNotifyBrowserOfInjections() ? kInvalidRequestId
                                         : g_next_pending_id++;
   render_view->Send(new ExtensionHostMsg_RequestScriptInjectionPermission(
       render_view->GetRoutingID(),
-      host_id_.id(),
+      host_id().id(),
       injector_->script_type(),
       request_id_));
 }
 
 void ScriptInjection::NotifyWillNotInject(
     ScriptInjector::InjectFailureReason reason) {
   complete_ = true;
   injector_->OnWillNotInject(reason);
 }
 
@@ skipping 119 matching lines @@
   std::vector<std::string> css_sources =
       injector_->GetCssSources(run_location_);
   for (std::vector<std::string>::const_iterator iter = css_sources.begin();
        iter != css_sources.end();
        ++iter) {
     frame->document().insertStyleSheet(blink::WebString::fromUTF8(*iter));
   }
 }
 
 }  // namespace extensions