Remove chrome-extension-resource:// scheme

chrome/common/chrome_content_client.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/chrome_content_client.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
@@ skipping 536 matching lines @@
     const base::Version version(WIDEVINE_CDM_VERSION_STRING);
     DCHECK(version.IsValid());
     cdms->push_back(content::CdmInfo(kWidevineCdmType, version, cdm_path,
                                      codecs_supported));
   }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT)
 
   // TODO(jrummell): Add External Clear Key CDM for testing, if it's available.
 }
 
+static const url::SchemeWithType kChromeStandardURLSchemes[] = {
+    {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT},
+    {chrome::kChromeNativeScheme, url::SCHEME_WITHOUT_PORT},
+    {chrome::kChromeSearchScheme, url::SCHEME_WITHOUT_PORT},
+    {dom_distiller::kDomDistillerScheme, url::SCHEME_WITHOUT_PORT},
 #if defined(OS_CHROMEOS)
-static const int kNumChromeStandardURLSchemes = 6;
-#else
-static const int kNumChromeStandardURLSchemes = 5;
-#endif
-static const url::SchemeWithType kChromeStandardURLSchemes[
-    kNumChromeStandardURLSchemes] = {
-  {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT},
-  {chrome::kChromeNativeScheme, url::SCHEME_WITHOUT_PORT},
-  {extensions::kExtensionResourceScheme, url::SCHEME_WITHOUT_PORT},
-  {chrome::kChromeSearchScheme, url::SCHEME_WITHOUT_PORT},
-  {dom_distiller::kDomDistillerScheme, url::SCHEME_WITHOUT_PORT},
-#if defined(OS_CHROMEOS)
-  {chrome::kCrosScheme, url::SCHEME_WITHOUT_PORT},
+    {chrome::kCrosScheme, url::SCHEME_WITHOUT_PORT},
 #endif
 };
 
 void ChromeContentClient::AddAdditionalSchemes(
     std::vector<url::SchemeWithType>* standard_schemes,
     std::vector<url::SchemeWithType>* referrer_schemes,
     std::vector<std::string>* savable_schemes) {
-  for (int i = 0; i < kNumChromeStandardURLSchemes; i++)
-    standard_schemes->push_back(kChromeStandardURLSchemes[i]);
+  for (const url::SchemeWithType& standard_scheme : kChromeStandardURLSchemes)
+    standard_schemes->push_back(standard_scheme);
 
 #if defined(OS_ANDROID)
   referrer_schemes->push_back(
       {chrome::kAndroidAppScheme, url::SCHEME_WITHOUT_PORT});
 #endif
 
   savable_schemes->push_back(extensions::kExtensionScheme);
-  savable_schemes->push_back(extensions::kExtensionResourceScheme);
   savable_schemes->push_back(chrome::kChromeSearchScheme);
   savable_schemes->push_back(dom_distiller::kDomDistillerScheme);
 }
 
 std::string ChromeContentClient::GetProduct() const {
   return ::GetProduct();
 }
 
 std::string ChromeContentClient::GetUserAgent() const {
   return ::GetUserAgent();
@@ skipping 47 matching lines @@
   return false;
 }
 #endif
 
 void ChromeContentClient::AddSecureSchemesAndOrigins(
     std::set<std::string>* schemes,
     std::set<GURL>* origins) {
   schemes->insert(chrome::kChromeSearchScheme);
   schemes->insert(content::kChromeUIScheme);
   schemes->insert(extensions::kExtensionScheme);
-  schemes->insert(extensions::kExtensionResourceScheme);
   GetSecureOriginWhitelist(origins);
 }
 
 void ChromeContentClient::AddServiceWorkerSchemes(
     std::set<std::string>* schemes) {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   if (extensions::feature_util::ExtensionServiceWorkersEnabled())
     schemes->insert(extensions::kExtensionScheme);
 #endif
 }
 
 bool ChromeContentClient::AllowScriptExtensionForServiceWorker(
     const GURL& script_url) {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  return script_url.SchemeIs(extensions::kExtensionScheme) ||
-         script_url.SchemeIs(extensions::kExtensionResourceScheme);
+  return script_url.SchemeIs(extensions::kExtensionScheme);
 #else
   return false;
 #endif
 }
 
 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   return extensions::IsIsolateExtensionsEnabled();
 #else
   return false;
 #endif
 }
 
 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() {
   if (!origin_trial_policy_)
     origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>();
   return origin_trial_policy_.get();
 }
 
 #if defined(OS_ANDROID)
 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
   return new ChromeMediaClientAndroid();
 }
 #endif  // OS_ANDROID