| Index: android_webview/browser/aw_content_browser_client.h
|
| diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
|
| index 3aa78ecf7f309c1da278fbf621bc91292495fce3..874caa7e3c154305acb2793b42c1641aca742901 100644
|
| --- a/android_webview/browser/aw_content_browser_client.h
|
| +++ b/android_webview/browser/aw_content_browser_client.h
|
| @@ -41,30 +41,12 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
|
| content::RenderProcessHost* host) OVERRIDE;
|
| virtual net::URLRequestContextGetter* CreateRequestContext(
|
| content::BrowserContext* browser_context,
|
| - 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) OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
|
| content::BrowserContext* browser_context,
|
| const base::FilePath& partition_path,
|
| bool in_memory,
|
| - 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) OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| virtual std::string GetCanonicalEncodingNameByAliasName(
|
| const std::string& alias_name) OVERRIDE;
|
| virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
|
|
|