Separate PermissionsData::CanExecuteScriptOnPage into two functions

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 236 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 (!extension->permissions_data()->CanExecuteScriptOnPage(
+  if (!script_->MatchesURL(effective_document_url))
+    return false;
+
+  if (!extension->permissions_data()->CanContentScriptPage(
           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,
@@ skipping 74 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