| Index: chrome/browser/profiles/profile_impl.h
|
| diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
|
| index 7ffa9688cef291879d902e3cd13969a0c6d9efd6..86f4771b9b80d38a83da0f4490e64c75f135b055 100644
|
| --- a/chrome/browser/profiles/profile_impl.h
|
| +++ b/chrome/browser/profiles/profile_impl.h
|
| @@ -17,6 +17,7 @@
|
| #include "base/timer.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_impl_io_data.h"
|
| +#include "content/public/browser/content_browser_client.h"
|
| #include "content/public/browser/host_zoom_map.h"
|
|
|
| class NetPrefObserver;
|
| @@ -106,29 +107,11 @@ class ProfileImpl : public Profile {
|
| virtual bool IsSameProfile(Profile* profile) OVERRIDE;
|
| virtual base::Time GetStartTime() const OVERRIDE;
|
| 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) OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| 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) OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| virtual base::FilePath last_selected_directory() OVERRIDE;
|
| virtual void set_last_selected_directory(const base::FilePath& path) OVERRIDE;
|
| virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
|
|
|