Move the parsing of "chrome_url_overrides" out of Extension.

chrome/common/extensions/extension.cc

 // Copyright (c) 2012 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/extension.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 54 matching lines @@
 using extensions::csp_validator::ContentSecurityPolicyIsSandboxed;
 using extensions::csp_validator::ContentSecurityPolicyIsSecure;
 
 namespace extensions {
 
 namespace {
 
 const int kModernManifestVersion = 2;
 const int kPEMOutputColumns = 65;
 
-const char kOverrideExtentUrlPatternFormat[] = "chrome://%s/*";
-
 // The maximum number of commands (including page action/browser actions) an
 // extension can have.
 const size_t kMaxCommandsPerExtension = 4;
 
 // KEY MARKERS
 const char kKeyBeginHeaderMarker[] = "-----BEGIN";
 const char kKeyBeginFooterMarker[] = "-----END";
 const char kKeyInfoEndMarker[] = "KEY-----";
 const char kPublic[] = "PUBLIC";
 const char kPrivate[] = "PRIVATE";
@@ skipping 1232 matching lines @@
 }
 
 bool Extension::is_extension() const {
   return manifest()->is_extension();
 }
 
 bool Extension::can_be_incognito_enabled() const {
   return !is_platform_app();
 }
 
+void Extension::AddWebExtentPattern(const URLPattern& pattern) {
+  extent_.AddPattern(pattern);
+}
+
 bool Extension::is_theme() const {
   return manifest()->is_theme();
 }
 
 ExtensionResource Extension::GetContentPackSiteList() const {
   if (content_pack_site_list_.empty())
     return ExtensionResource();
 
   return GetResource(content_pack_site_list_);
 }
@@ skipping 1296 matching lines @@
   if (manifest_->HasKey(keys::kConvertedFromUserScript))
     manifest_->GetBoolean(keys::kConvertedFromUserScript,
                           &converted_from_user_script_);
 
   if (!LoadManifestHandlerFeatures(error) ||
       !LoadContentScripts(error) ||
       !LoadPageAction(error) ||
       !LoadBrowserAction(error) ||
       !LoadSystemIndicator(api_permissions, error) ||
       !LoadScriptBadge(error) ||
-      !LoadChromeURLOverrides(error) ||
       !LoadIncognitoMode(error) ||
       !LoadFileHandlers(error) ||
       !LoadContentSecurityPolicy(error))
     return false;
 
   return true;
 }
 
 bool Extension::LoadManifestHandlerFeatures(string16* error) {
   std::vector<std::string> keys = ManifestHandler::GetKeys();
@@ skipping 174 matching lines @@
     return false;
   }
 
   // Because the manifest was successfully parsed, auto-grant the permission.
   // TODO(dewittj) Add this for all extension action APIs.
   api_permissions->insert(APIPermission::kSystemIndicator);
 
   return true;
 }
 
-
-bool Extension::LoadChromeURLOverrides(string16* error) {
-  if (!manifest_->HasKey(keys::kChromeURLOverrides))
-    return true;
-  DictionaryValue* overrides = NULL;
-  if (!manifest_->GetDictionary(keys::kChromeURLOverrides, &overrides)) {
-    *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
-    return false;
-  }
-
-  // Validate that the overrides are all strings
-  for (DictionaryValue::key_iterator iter = overrides->begin_keys();
-       iter != overrides->end_keys(); ++iter) {
-    std::string page = *iter;
-    std::string val;
-    // Restrict override pages to a list of supported URLs.
-    bool is_override = (page != chrome::kChromeUINewTabHost &&
-                        page != chrome::kChromeUIBookmarksHost &&
-                        page != chrome::kChromeUIHistoryHost);
-#if defined(OS_CHROMEOS)
-    is_override = (is_override &&
-                   page != chrome::kChromeUIActivationMessageHost);
-#endif
-#if defined(FILE_MANAGER_EXTENSION)
-    is_override = (is_override &&
-                   !(location() == COMPONENT &&
-                     page == chrome::kChromeUIFileManagerHost));
-#endif
-
-    if (is_override || !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
-      *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
-      return false;
-    }
-    // Replace the entry with a fully qualified chrome-extension:// URL.
-    chrome_url_overrides_[page] = GetResourceURL(val);
-
-    // For component extensions, add override URL to extent patterns.
-    if (is_legacy_packaged_app() && location() == COMPONENT) {
-      URLPattern pattern(URLPattern::SCHEME_CHROMEUI);
-      std::string url = base::StringPrintf(kOverrideExtentUrlPatternFormat,
-                                           page.c_str());
-      if (pattern.Parse(url) != URLPattern::PARSE_SUCCESS) {
-        *error = ErrorUtils::FormatErrorMessageUTF16(
-            errors::kInvalidURLPatternError, url);
-        return false;
-      }
-      extent_.AddPattern(pattern);
-    }
-  }
-
-  // An extension may override at most one page.
-  if (overrides->size() > 1) {
-    *error = ASCIIToUTF16(errors::kMultipleOverrides);
-    return false;
-  }
-
-  return true;
-}
-
 bool Extension::LoadIncognitoMode(string16* error) {
   // Apps default to split mode, extensions default to spanning.
   incognito_split_mode_ = is_app();
   if (!manifest_->HasKey(keys::kIncognito))
     return true;
   std::string value;
   if (!manifest_->GetString(keys::kIncognito, &value)) {
     *error = ASCIIToUTF16(errors::kInvalidIncognitoBehavior);
     return false;
   }
@@ skipping 753 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions