Separate PermissionsData::CanExecuteScriptOnPage into two functions

extensions/renderer/script_injection.cc

Index: extensions/renderer/script_injection.cc
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index c7eb9a4183fea8544985ae4837cfe96b5c8f7645..dc46ae23d06fd4bb4ce0f40bdf075b24e43d76d5 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -254,12 +254,14 @@ bool ScriptInjection::WantsToRun(blink::WebFrame* frame,
   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;