| Index: chrome/browser/profiles/profile.h
|
| diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h
|
| index 1256c364b5995e0a08b23a9ebae96b3e6cd4b274..a5ae599bc2d4e3664ff4db182443dc9c055fbfe4 100644
|
| --- a/chrome/browser/profiles/profile.h
|
| +++ b/chrome/browser/profiles/profile.h
|
| @@ -14,6 +14,7 @@
|
| #include "base/logging.h"
|
| #include "chrome/browser/net/pref_proxy_config_tracker.h"
|
| #include "content/public/browser/browser_context.h"
|
| +#include "content/public/browser/content_browser_client.h"
|
| #include "net/url_request/url_request_job_factory.h"
|
|
|
| class ChromeAppCacheService;
|
| @@ -255,16 +256,7 @@ class Profile : public content::BrowserContext {
|
| // ContextBrowserClient to call this function.
|
| // TODO(ajwong): Remove once http://crbug.com/159193 is resolved.
|
| virtual net::URLRequestContextGetter* CreateRequestContext(
|
| - 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) = 0;
|
| + content::ProtocolHandlerMap* protocol_handlers) = 0;
|
|
|
| // Creates the net::URLRequestContextGetter for a StoragePartition. Should
|
| // only be called once per partition_path per ContentBrowserClient object.
|
| @@ -275,16 +267,7 @@ class Profile : public content::BrowserContext {
|
| virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
|
| 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) = 0;
|
| + content::ProtocolHandlerMap* protocol_handlers) = 0;
|
|
|
| // Returns the last directory that was chosen for uploading or opening a file.
|
| virtual base::FilePath last_selected_directory() = 0;
|
|
|