Remove chrome-extension-resource:// scheme

extensions/shell/common/shell_content_client.cc

 // Copyright 2014 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 "extensions/shell/common/shell_content_client.h"
 
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/user_agent.h"
 #include "extensions/common/constants.h"
@@ skipping 56 matching lines @@
   nacl.internal_entry_points.get_interface = nacl_plugin::PPP_GetInterface;
   nacl.internal_entry_points.initialize_module =
       nacl_plugin::PPP_InitializeModule;
   nacl.internal_entry_points.shutdown_module =
       nacl_plugin::PPP_ShutdownModule;
   nacl.permissions = ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV;
   plugins->push_back(nacl);
 #endif  // !defined(DISABLE_NACL)
 }
 
-static const int kNumShellStandardURLSchemes = 2;
-static const url::SchemeWithType kShellStandardURLSchemes[
-    kNumShellStandardURLSchemes] = {
-  {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT},
-  {extensions::kExtensionResourceScheme, url::SCHEME_WITHOUT_PORT},
+static const url::SchemeWithType kShellStandardURLSchemes[] = {

[James Cook, 2016/12/14 20:41:49]

nit: eliminate this and the iteration below, just add the one item directly

[ncarter (slow), 2016/12/14 22:26:42]

Done.

+    {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT},
 };
 
 void ShellContentClient::AddAdditionalSchemes(
     std::vector<url::SchemeWithType>* standard_schemes,
     std::vector<url::SchemeWithType>* referrer_schemes,
     std::vector<std::string>* savable_schemes) {
-  for (int i = 0; i < kNumShellStandardURLSchemes; i++)
-    standard_schemes->push_back(kShellStandardURLSchemes[i]);
+  for (const url::SchemeWithType& standard_scheme : kShellStandardURLSchemes)
+    standard_schemes->push_back(standard_scheme);
 
   savable_schemes->push_back(kExtensionScheme);
-  savable_schemes->push_back(kExtensionResourceScheme);
 }
 
 std::string ShellContentClient::GetUserAgent() const {
   // Must contain a user agent string for version sniffing. For example,
   // pluginless WebRTC Hangouts checks the Chrome version number.
   return content::BuildUserAgentFromProduct("Chrome/" PRODUCT_VERSION);
 }
 
 base::string16 ShellContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::StringPiece ShellContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
   return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 base::RefCountedMemory* ShellContentClient::GetDataResourceBytes(
     int resource_id) const {
   return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
 }
 
 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {
   return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
 }
 
 }  // namespace extensions