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

extensions/renderer/user_script_injector.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_injector.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "content/public/common/url_constants.h"
@@ skipping 42 matching lines @@
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 UserScriptInjector::UserScriptInjector(
     const UserScript* script,
     UserScriptSet* script_list,
     bool is_declarative)
     : script_(script),
       script_id_(script_->id()),
       extension_id_(script_->extension_id()),

[Devlin, 2015/02/09 17:40:25]

Things like this will need to be updated soon.

[Xi Han, 2015/02/09 23:28:11]

You are absolutely right. I will have a patch to de-couple extensions in the
render soon.

       is_declarative_(is_declarative),
       user_script_set_observer_(this) {
   user_script_set_observer_.Add(script_list);
 }
 
 UserScriptInjector::~UserScriptInjector() {
 }
 
 void UserScriptInjector::OnUserScriptsUpdated(
     const std::set<std::string>& changed_extensions,
@@ skipping 41 matching lines @@
          !script_->js_scripts().empty();
 }
 
 bool UserScriptInjector::ShouldInjectCss(
     UserScript::RunLocation run_location) const {
   return run_location == UserScript::DOCUMENT_START &&
          !script_->css_scripts().empty();
 }
 
 PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame(
-    const Extension* extension,
+    const Host* host,
     blink::WebFrame* web_frame,
     int tab_id,
     const GURL& top_url) const {
   // If we don't have a tab id, we have no UI surface to ask for user consent.
   // For now, we treat this as an automatic allow.
   if (tab_id == -1)
     return PermissionsData::ACCESS_ALLOWED;
 
   GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
       web_frame, web_frame->document().url(), script_->match_about_blank());
-
-  // Declarative user scripts use "page access" (from "permissions" section in
-  // manifest) whereas non-declarative user scripts use custom
-  // "content script access" logic.
-  if (is_declarative_) {
-    return extension->permissions_data()->GetPageAccess(
-        extension,
-        effective_document_url,
-        top_url,
-        tab_id,
-        -1,  // no process id
-        NULL /* ignore error */);
-  } else {
-    return extension->permissions_data()->GetContentScriptAccess(
-        extension,
-        effective_document_url,
-        top_url,
-        tab_id,
-        -1,  // no process id
-        NULL /* ignore error */);
-  }
+  return host->CanExecuteOnFrame(
+      effective_document_url, top_url, tab_id, is_declarative_);
 }
 
 std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
     UserScript::RunLocation run_location) const {
   DCHECK_EQ(script_->run_location(), run_location);
 
   std::vector<blink::WebScriptSource> sources;
   const UserScript::FileList& js_scripts = script_->js_scripts();
   bool is_standalone_or_emulate_greasemonkey =
       script_->is_standalone() || script_->emulate_greasemonkey();
@@ skipping 53 matching lines @@
   }
 
   if (ShouldInjectCss(run_location))
     scripts_run_info->num_css += script_->css_scripts().size();
 }
 
 void UserScriptInjector::OnWillNotInject(InjectFailureReason reason) {
 }
 
 }  // namespace extensions