Update valid URLPattern schemes in ExtensionPrefs::GetGrantedPermissions

chrome/browser/extensions/extension_prefs.cc

 // Copyright (c) 2010 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/extension_prefs.h"
 
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_notifier.h"
@@ skipping 469 matching lines @@
   if (!ext || !ext->GetBoolean(kPrefGrantedPermissionsAll, full_access))
     return false;
 
   ReadExtensionPrefStringSet(
       extension_id, kPrefGrantedPermissionsAPI, api_permissions);
 
   std::set<std::string> host_permissions;
   ReadExtensionPrefStringSet(
       extension_id, kPrefGrantedPermissionsHost, &host_permissions);
 
+  // The granted host permissions contain hosts from the manifest's
+  // "permissions" array and from the content script "matches" arrays,
+  // so the URLPattern needs to accept valid schemes from both types.
   for (std::set<std::string>::iterator i = host_permissions.begin();
        i != host_permissions.end(); ++i)
     host_extent->AddPattern(URLPattern(
-        Extension::kValidWebExtentSchemes | UserScript::kValidUserScriptSchemes,
+        Extension::kValidHostPermissionSchemes |
+        UserScript::kValidUserScriptSchemes,
         *i));
 
   return true;
 }
 
 void ExtensionPrefs::AddGrantedPermissions(
     const std::string& extension_id,
     const bool full_access,
     const std::set<std::string>& api_permissions,
     const ExtensionExtent& host_extent) {
@@ skipping 590 matching lines @@
 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionsPref);
   prefs->RegisterListPref(kExtensionToolbar);
   prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize, -1);
   prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate);
   prefs->RegisterListPref(prefs::kExtensionInstallAllowList);
   prefs->RegisterListPref(prefs::kExtensionInstallDenyList);
   prefs->RegisterListPref(prefs::kExtensionInstallForceList);
   prefs->RegisterStringPref(kWebStoreLogin, std::string() /* default_value */);
 }