| Index: android_webview/browser/aw_content_browser_client.cc
|
| diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
|
| index dcca91d26f281f49ee7ef5f82afcd8098bd8210d..b5455613c2d46e6cf2eb359aa9f8ef1964021492 100644
|
| --- a/android_webview/browser/aw_content_browser_client.cc
|
| +++ b/android_webview/browser/aw_content_browser_client.cc
|
| @@ -212,9 +212,11 @@ void AwContentBrowserClient::RenderProcessWillLaunch(
|
| net::URLRequestContextGetter*
|
| AwContentBrowserClient::CreateRequestContext(
|
| content::BrowserContext* browser_context,
|
| - content::ProtocolHandlerMap* protocol_handlers) {
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::ProtocolHandlerScopedVector protocol_interceptors) {
|
| DCHECK(browser_context_.get() == browser_context);
|
| - return browser_context_->CreateRequestContext(protocol_handlers);
|
| + return browser_context_->CreateRequestContext(protocol_handlers,
|
| + protocol_interceptors.Pass());
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| @@ -222,10 +224,13 @@ AwContentBrowserClient::CreateRequestContextForStoragePartition(
|
| content::BrowserContext* browser_context,
|
| const base::FilePath& partition_path,
|
| bool in_memory,
|
| - content::ProtocolHandlerMap* protocol_handlers) {
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::ProtocolHandlerScopedVector protocol_interceptors) {
|
| DCHECK(browser_context_.get() == browser_context);
|
| return browser_context_->CreateRequestContextForStoragePartition(
|
| - partition_path, in_memory, protocol_handlers);
|
| + partition_path, in_memory,
|
| + protocol_handlers,
|
| + protocol_interceptors.Pass());
|
| }
|
|
|
| std::string AwContentBrowserClient::GetCanonicalEncodingNameByAliasName(
|
|
|