Make the new WebUI's code handle all webui schemes, instead of just chrome://.

content/browser/storage_partition_impl_map.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 "content/browser/storage_partition_impl_map.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 397 matching lines @@
   ProtocolHandlerMap protocol_handlers;
   protocol_handlers[url::kBlobScheme] =
       linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
           new BlobProtocolHandler(blob_storage_context,
                                   stream_context,
                                   partition->GetFileSystemContext()));
   protocol_handlers[url::kFileSystemScheme] =
       linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
           CreateFileSystemProtocolHandler(partition_domain,
                                           partition->GetFileSystemContext()));
-  protocol_handlers[kChromeUIScheme] =
-      linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-          URLDataManagerBackend::CreateProtocolHandler(
-              browser_context_->GetResourceContext(),
-              blob_storage_context).release());
-  std::vector<std::string> additional_webui_schemes;
-  GetContentClient()->browser()->GetAdditionalWebUISchemes(
-      &additional_webui_schemes);
-  for (std::vector<std::string>::const_iterator it =
-           additional_webui_schemes.begin();
-       it != additional_webui_schemes.end();
-       ++it) {
-    protocol_handlers[*it] =
+  for (const auto& scheme : URLDataManagerBackend::GetWebUISchemes()) {
+    protocol_handlers[scheme] =
         linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
             URLDataManagerBackend::CreateProtocolHandler(
-                browser_context_->GetResourceContext(),
-                blob_storage_context).release());
+                browser_context_->GetResourceContext(), blob_storage_context)
+                .release());
   }
 
   protocol_handlers[kChromeDevToolsScheme] =
       linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
           CreateDevToolsProtocolHandler(
               browser_context_->GetResourceContext()));
 
   URLRequestInterceptorScopedVector request_interceptors;
   request_interceptors.push_back(ServiceWorkerRequestHandler::CreateInterceptor(
       browser_context_->GetResourceContext()));
@@ skipping 162 matching lines @@
 
     // We do not call InitializeURLRequestContext() for media contexts because,
     // other than the HTTP cache, the media contexts share the same backing
     // objects as their associated "normal" request context.  Thus, the previous
     // call serves to initialize the media request context for this storage
     // partition as well.
   }
 }
 
 }  // namespace content