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

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 105 matching lines @@
       keys_to_delete.insert(key);
   }
   for (auto& key : keys_to_delete)
     isolated_worlds.erase(key);
 }
 
 ScriptInjection::ScriptInjection(
     scoped_ptr<ScriptInjector> injector,
     blink::WebLocalFrame* web_frame,
     const HostID& host_id,
-    int instance_id,
+    const ConsumerInstanceInfo& consumer_instance_info,
     UserScript::RunLocation run_location,
     int tab_id)
     : injector_(injector.Pass()),
       web_frame_(web_frame),
       host_id_(host_id),
-      instance_id_(instance_id),
+      consumer_instance_info_(consumer_instance_info),
       run_location_(run_location),
       tab_id_(tab_id),
       request_id_(kInvalidRequestId),
       complete_(false) {
 }
 
 ScriptInjection::~ScriptInjection() {
   if (!complete_)
     injector_->OnWillNotInject(ScriptInjector::WONT_INJECT);
 }
@@ skipping 34 matching lines @@
                                           ScriptsRunInfo* scripts_run_info) {
   if (!injection_host) {
     NotifyWillNotInject(ScriptInjector::EXTENSION_REMOVED);
     return false;
   }
 
   Inject(injection_host, scripts_run_info);
   return true;
 }
 
 void ScriptInjection::RequestPermission() {

[Devlin, 2015/02/11 20:29:01]

This should be a no-op if this is from a webui.

[Xi Han, 2015/02/11 21:57:24]

Oh, I see. Even ExtensionHostMsg_RequestScriptInjectionPermission with request =
-1 will updated permitted_extensions list, which is for extensions only.
Updated. 

   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_ = ShouldNotifyBrowserOfInjections() ? kInvalidRequestId
-                                                  : g_next_pending_id++;
+  request_id_ =
+      consumer_instance_info_.type() == ConsumerInstanceInfo::WEBVIEW ||
+              ShouldNotifyBrowserOfInjections()
+          ? kInvalidRequestId
+          : g_next_pending_id++;
   render_view->Send(new ExtensionHostMsg_RequestScriptInjectionPermission(
       render_view->GetRoutingID(),
       host_id_.id(),
       injector_->script_type(),
       request_id_));
 }
 
 void ScriptInjection::NotifyWillNotInject(
     ScriptInjector::InjectFailureReason reason) {
   complete_ = true;
@@ skipping 60 matching lines @@
 
 void ScriptInjection::InjectJs(const InjectionHost* injection_host,
                                blink::WebLocalFrame* frame,
                                base::ListValue* execution_results) {
   std::vector<blink::WebScriptSource> sources =
       injector_->GetJsSources(run_location_);
   bool in_main_world = injector_->ShouldExecuteInMainWorld();
   int world_id = in_main_world
                      ? DOMActivityLogger::kMainWorldId
                      : GetIsolatedWorldIdForInstance(
-                         injection_host, instance_id_, frame);
+                         injection_host, consumer_instance_info_.id(), frame);
   bool expects_results = injector_->ExpectsResults();
 
   base::ElapsedTimer exec_timer;
   if (injection_host->id().type() == HostID::EXTENSIONS)
     DOMActivityLogger::AttachToWorld(world_id, injection_host->id().id());
   v8::HandleScope scope(v8::Isolate::GetCurrent());
   v8::Local<v8::Value> script_value;
   if (in_main_world) {
     // We only inject in the main world for javascript: urls.
     DCHECK_EQ(1u, sources.size());
@@ skipping 41 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