Refactor PermissionsData pt1

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 <vector>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
@@ skipping 136 matching lines @@
 
   int tab_id = ExtensionHelper::Get(top_render_view)->tab_id();
 
   // By default, we allow injection.
   bool should_inject = true;
 
   // Check if the extension requires user consent for injection *and* we have a
   // valid tab id (if we don't have a tab id, we have no UI surface to ask for
   // user consent).
   if (tab_id != -1 &&
-      PermissionsData::RequiresActionForScriptExecution(
-          extension,
-          tab_id,
-          frame->top()->document().url())) {
+      PermissionsData::ForExtension(extension)
+          ->RequiresActionForScriptExecution(extension,
+                                             tab_id,
+                                             frame->top()->document().url())) {
     int64 request_id = kInvalidRequestId;
     int page_id = top_render_view->GetPageId();
 
     // We only delay the injection if the feature is enabled.
     // Otherwise, we simply treat this as a notification by passing an invalid
     // id.
     if (FeatureSwitch::scripts_require_action()->IsEnabled()) {
       should_inject = false;
       ScopedVector<PendingInjection>::iterator pending_injection =
           pending_injections_.insert(
@@ skipping 78 matching lines @@
     return false;
 
   // Content scripts are not tab-specific.
   static const int kNoTabId = -1;
   // We don't have a process id in this context.
   static const int kNoProcessId = -1;
 
   GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
       frame, document_url, script_->match_about_blank());
 
-  if (!PermissionsData::CanExecuteScriptOnPage(extension,
-                                               effective_document_url,
-                                               frame->top()->document().url(),
-                                               kNoTabId,
-                                               script_.get(),
-                                               kNoProcessId,
-                                               NULL /* ignore error */)) {
+  if (!PermissionsData::ForExtension(extension)
+           ->CanExecuteScriptOnPage(extension,
+                                    effective_document_url,
+                                    frame->top()->document().url(),
+                                    kNoTabId,
+                                    script_.get(),
+                                    kNoProcessId,
+                                    NULL /* ignore error */)) {
     return false;
   }
 
   return ShouldInjectCSS(run_location) || ShouldInjectJS(run_location);
 }
 
 void ScriptInjection::Inject(blink::WebFrame* frame,
                              UserScript::RunLocation run_location,
                              ScriptsRunInfo* scripts_run_info) const {
   DCHECK(frame);
@@ skipping 72 matching lines @@
   scripts_run_info->num_css += css_scripts.size();
   for (UserScript::FileList::const_iterator iter = css_scripts.begin();
        iter != css_scripts.end();
        ++iter) {
     frame->document().insertStyleSheet(
         blink::WebString::fromUTF8(iter->GetContent().as_string()));
   }
 }
 
 }  // namespace extensions