| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 3e4a3e99694f98666f8362f3da9208763b6a81a4..da813d9cff18bae645cd2bf86ecea28712341595 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -1072,12 +1072,13 @@ void ChromeContentBrowserClient::GetAdditionalWebUISchemes(
|
| additional_schemes->push_back(chrome::kDomDistillerScheme);
|
| }
|
|
|
| -net::URLRequestContextGetter*
|
| -ChromeContentBrowserClient::CreateRequestContext(
|
| +net::URLRequestContextGetter* ChromeContentBrowserClient::CreateRequestContext(
|
| content::BrowserContext* browser_context,
|
| - content::ProtocolHandlerMap* protocol_handlers) {
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::ProtocolHandlerScopedVector protocol_interceptors) {
|
| Profile* profile = Profile::FromBrowserContext(browser_context);
|
| - return profile->CreateRequestContext(protocol_handlers);
|
| + return profile->CreateRequestContext(protocol_handlers,
|
| + protocol_interceptors.Pass());
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| @@ -1085,10 +1086,14 @@ ChromeContentBrowserClient::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) {
|
| Profile* profile = Profile::FromBrowserContext(browser_context);
|
| return profile->CreateRequestContextForStoragePartition(
|
| - partition_path, in_memory, protocol_handlers);
|
| + partition_path,
|
| + in_memory,
|
| + protocol_handlers,
|
| + protocol_interceptors.Pass());
|
| }
|
|
|
| bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) {
|
|
|