Refactor PermissionsData to pull out the check for scripting the webstore.

chrome/common/extensions/permissions/permissions_data.cc

 // Copyright (c) 2013 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/common/extensions/permissions/permissions_data.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_constants.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
-#include "extensions/common/manifest_constants.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/url_pattern_set.h"
 #include "extensions/common/user_script.h"
 #include "url/gurl.h"
 
 namespace extensions {
@@ skipping 419 matching lines @@
 
 // static
 bool PermissionsData::CanExecuteScriptOnPage(const Extension* extension,
                                              const GURL& document_url,
                                              const GURL& top_frame_url,
                                              int tab_id,
                                              const UserScript* script,
                                              int process_id,
                                              std::string* error) {
   base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
-  // The gallery is special-cased as a restricted URL for scripting to prevent
-  // access to special JS bindings we expose to the gallery (and avoid things
-  // like extensions removing the "report abuse" link).
-  // TODO(erikkay): This seems like the wrong test.  Shouldn't we we testing
-  // against the store app extent?
-  GURL store_url(extension_urls::GetWebstoreLaunchURL());
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   bool can_execute_everywhere = CanExecuteScriptEverywhere(extension);
 
   if (g_policy_delegate &&
       !g_policy_delegate->CanExecuteScriptOnPage(
            extension, document_url, top_frame_url, tab_id,
            script, process_id, error))
     return false;
 
-  if ((document_url.host() == store_url.host()) &&
-      !can_execute_everywhere &&
-      !command_line->HasSwitch(switches::kAllowScriptingGallery)) {
-    if (error)
-      *error = errors::kCannotScriptGallery;
+  if (!can_execute_everywhere &&
+      !ExtensionsClient::Get()->IsScriptableURL(document_url, error)) {
     return false;
   }
 
   if (!command_line->HasSwitch(switches::kExtensionsOnChromeURLs)) {
     if (document_url.SchemeIs(chrome::kChromeUIScheme) &&
         !can_execute_everywhere) {
       if (error)
         *error = errors::kCannotAccessChromeUrl;
       return false;
     }
@@ skipping 124 matching lines @@
   optional_permission_set_ = new PermissionSet(
       initial_optional_permissions_->api_permissions,
       initial_optional_permissions_->host_permissions,
       URLPatternSet());
 
   initial_required_permissions_.reset();
   initial_optional_permissions_.reset();
 }
 
 }  // namespace extensions