Separate PermissionsData::CanExecuteScriptOnPage into two functions

chrome/browser/extensions/api/automation_internal/automation_internal_api.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 "chrome/browser/extensions/api/automation_internal/automation_internal_api.h"
 
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_action_adapter.h"
@@ skipping 41 matching lines @@
 
   const GURL& url = contents->GetURL();
   // TODO(aboxhall): check for webstore URL
   if (automation_info->matches.MatchesURL(url))
     return true;
 
   int tab_id = ExtensionTabUtil::GetTabId(contents);
   content::RenderProcessHost* process = contents->GetRenderProcessHost();
   int process_id = process ? process->GetID() : -1;
   std::string unused_error;
-  return extension->permissions_data()->CanExecuteScriptOnPage(
-      extension, url, url, tab_id, NULL, process_id, &unused_error);
+  return extension->permissions_data()->CanAccessPage(
+      extension, url, url, tab_id, process_id, &unused_error);
 }
 
 // Helper class that receives accessibility data from |WebContents|.
 class AutomationWebContentsObserver
     : public content::WebContentsObserver,
       public content::WebContentsUserData<AutomationWebContentsObserver> {
  public:
   virtual ~AutomationWebContentsObserver() {}
 
   // content::WebContentsObserver overrides.
@@ skipping 167 matching lines @@
     return RespondNow(Error("desktop permission must be requested"));
 
   AutomationManagerAsh::GetInstance()->Enable(browser_context());
   return RespondNow(NoArguments());
 #else
   return RespondNow(Error("getDesktop is unsupported by this platform"));
 #endif  // defined(OS_CHROMEOS)
 }
 
 }  // namespace extensions