| Index: content/shell/browser/shell_browser_context.cc
|
| diff --git a/content/shell/browser/shell_browser_context.cc b/content/shell/browser/shell_browser_context.cc
|
| index 5eb71e513bcd548bb5fcb414ff85702b8824bdf2..dbceb625ce2a170556204d177f86668635a97036 100644
|
| --- a/content/shell/browser/shell_browser_context.cc
|
| +++ b/content/shell/browser/shell_browser_context.cc
|
| @@ -139,7 +139,8 @@ net::URLRequestContextGetter* ShellBrowserContext::GetRequestContext() {
|
| }
|
|
|
| net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
|
| - ProtocolHandlerMap* protocol_handlers) {
|
| + ProtocolHandlerMap* protocol_handlers,
|
| + ProtocolHandlerScopedVector protocol_interceptors) {
|
| DCHECK(!url_request_getter_.get());
|
| url_request_getter_ = new ShellURLRequestContextGetter(
|
| ignore_certificate_errors_,
|
| @@ -147,6 +148,7 @@ net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
|
| BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
|
| BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
|
| protocol_handlers,
|
| + protocol_interceptors.Pass(),
|
| net_log_);
|
| resource_context_->set_url_request_context_getter(url_request_getter_.get());
|
| return url_request_getter_.get();
|
| @@ -214,10 +216,11 @@ void ShellBrowserContext::CancelProtectedMediaIdentifierPermissionRequests(
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| - ShellBrowserContext::CreateRequestContextForStoragePartition(
|
| - const base::FilePath& partition_path,
|
| - bool in_memory,
|
| - ProtocolHandlerMap* protocol_handlers) {
|
| +ShellBrowserContext::CreateRequestContextForStoragePartition(
|
| + const base::FilePath& partition_path,
|
| + bool in_memory,
|
| + ProtocolHandlerMap* protocol_handlers,
|
| + ProtocolHandlerScopedVector protocol_interceptors) {
|
| return NULL;
|
| }
|
|
|
|
|