Add chrome-search: access from Instant overlay

android_webview/browser/net/aw_url_request_context_getter.h

Index: android_webview/browser/net/aw_url_request_context_getter.h
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h
index cc2d81fadc54c40a2abea5f1e7985d0555ec887d..0caf3b763a7d0c9903ea87c11c50ab5afbb43ce8 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.h
+++ b/android_webview/browser/net/aw_url_request_context_getter.h
@@ -54,15 +54,8 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter,
   // on the UI thread while |job_factory_| must be created on the IO thread.
   void SetProtocolHandlers(
       scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-          blob_protocol_handler,
-      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-          file_system_protocol_handler,
-      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
           developer_protocol_handler,
-      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-          chrome_protocol_handler,
-      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-          chrome_devtools_protocol_handler);
+      content::ProtocolHandlerMap* protocol_handlers);
 
   void PopulateNetworkSessionParams(net::HttpNetworkSession::Params* params);
 
@@ -74,15 +67,9 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter,
 
   // ProtocolHandlers are stored here between SetProtocolHandlers() and the
   // first GetURLRequestContext() call.
-  scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> blob_protocol_handler_;
-  scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-      file_system_protocol_handler_;
   scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
       developer_protocol_handler_;
-  scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-      chrome_protocol_handler_;
-  scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-      chrome_devtools_protocol_handler_;
+  content::ProtocolHandlerMap protocol_handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(AwURLRequestContextGetter);
 };