| Index: android_webview/browser/aw_browser_context.cc
|
| diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
|
| index 05f68e3856aff0e35015d4d8258ac3744cdd8cac..42447f95b1f670a08069be0ceaa0db5caeb24311 100644
|
| --- a/android_webview/browser/aw_browser_context.cc
|
| +++ b/android_webview/browser/aw_browser_context.cc
|
| @@ -126,14 +126,16 @@ void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
|
| }
|
|
|
| net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext(
|
| - content::ProtocolHandlerMap* protocol_handlers) {
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::URLRequestInterceptorScopedVector request_interceptors) {
|
| // This function cannot actually create the request context because
|
| // there is a reentrant dependency on GetResourceContext() via
|
| // content::StoragePartitionImplMap::Create(). This is not fixable
|
| // until http://crbug.com/159193. Until then, assert that the context
|
| // has already been allocated and just handle setting the protocol_handlers.
|
| DCHECK(url_request_context_getter_);
|
| - url_request_context_getter_->SetProtocolHandlers(protocol_handlers);
|
| + url_request_context_getter_->SetHandlersAndInterceptors(
|
| + protocol_handlers, request_interceptors.Pass());
|
| return url_request_context_getter_;
|
| }
|
|
|
| @@ -141,7 +143,8 @@ net::URLRequestContextGetter*
|
| AwBrowserContext::CreateRequestContextForStoragePartition(
|
| const base::FilePath& partition_path,
|
| bool in_memory,
|
| - content::ProtocolHandlerMap* protocol_handlers) {
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::URLRequestInterceptorScopedVector request_interceptors) {
|
| NOTREACHED();
|
| return NULL;
|
| }
|
|
|