| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index d849d2811a1725f02cdd73852471fd6a2bc100ba..56f248085574fbeeb070cf7758428f0bc06770e4 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -23,6 +23,7 @@
|
| #include "content/public/browser/content_browser_client.h"
|
| #include "content/public/browser/resource_context.h"
|
| #include "net/cookies/cookie_monster.h"
|
| +#include "net/http/http_cache.h"
|
| #include "net/http/http_network_session.h"
|
| #include "net/url_request/url_request_job_factory.h"
|
|
|
| @@ -32,6 +33,7 @@ class CookieSettings;
|
| class HostContentSettingsMap;
|
| class ManagedModeURLFilter;
|
| class MediaDeviceIDSalt;
|
| +class NetworkController;
|
| class Profile;
|
| class ProtocolHandlerRegistry;
|
| class SigninNamesOnIOThread;
|
| @@ -183,6 +185,10 @@ class ProfileIOData {
|
| return transport_security_state_.get();
|
| }
|
|
|
| + NetworkController* network_controller() const {
|
| + return network_controller_;
|
| + }
|
| +
|
| #if defined(OS_CHROMEOS)
|
| std::string username_hash() const {
|
| return username_hash_;
|
| @@ -349,11 +355,10 @@ class ProfileIOData {
|
| // URLRequests may be accessing.
|
| void DestroyResourceContext();
|
|
|
| - // Fills in fields of params using values from main_request_context_ and the
|
| - // IOThread associated with profile_params.
|
| - void PopulateNetworkSessionParams(
|
| + // Creates network session and network transaction factory.
|
| + scoped_ptr<net::HttpCache> CreateMainHttpFactory(
|
| const ProfileParams* profile_params,
|
| - net::HttpNetworkSession::Params* params) const;
|
| + net::HttpCache::BackendFactory* main_backend) const;
|
|
|
| void SetCookieSettingsForTesting(CookieSettings* cookie_settings);
|
|
|
| @@ -550,6 +555,8 @@ class ProfileIOData {
|
| mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_;
|
| #endif
|
|
|
| + mutable NetworkController* network_controller_;
|
| +
|
| // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
|
| bool initialized_on_UI_thread_;
|
|
|
|
|