Remove chrome-extension-resource:// scheme

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 20ba8876bd79e7d9d3672156011d40499d53f9f0..2f9683395615648c57bc35cb741c2fbf13007c68 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -554,20 +554,13 @@ void ChromeContentClient::AddContentDecryptionModules(
   // 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
 };
 
@@ -575,8 +568,8 @@ 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(
@@ -584,7 +577,6 @@ void ChromeContentClient::AddAdditionalSchemes(
 #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);
 }
@@ -652,7 +644,6 @@ void ChromeContentClient::AddSecureSchemesAndOrigins(
   schemes->insert(chrome::kChromeSearchScheme);
   schemes->insert(content::kChromeUIScheme);
   schemes->insert(extensions::kExtensionScheme);
-  schemes->insert(extensions::kExtensionResourceScheme);
   GetSecureOriginWhitelist(origins);
 }
 
@@ -667,8 +658,7 @@ void ChromeContentClient::AddServiceWorkerSchemes(
 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