| 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 43b46d59cf76b87ca306502308faf66a71427cfc..45203fc2d160ab8208808b755567f6fa518f1d76 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -24,12 +24,14 @@
|
| #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"
|
|
|
| class ChromeHttpUserAgentSettings;
|
| class ChromeNetworkDelegate;
|
| class CookieSettings;
|
| +class DevToolsNetworkController;
|
| class HostContentSettingsMap;
|
| class ManagedModeURLFilter;
|
| class MediaDeviceIDSalt;
|
| @@ -179,6 +181,8 @@ class ProfileIOData {
|
|
|
| content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const;
|
|
|
| + void SetNetworkState(const std::string& client_id, bool offline) const;
|
| +
|
| net::TransportSecurityState* transport_security_state() const {
|
| return transport_security_state_.get();
|
| }
|
| @@ -355,11 +359,15 @@ 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 main network transaction factory.
|
| + scoped_ptr<net::HttpCache> CreateMainHttpFactory(
|
| const ProfileParams* profile_params,
|
| - net::HttpNetworkSession::Params* params) const;
|
| + net::HttpCache::BackendFactory* main_backend) const;
|
| +
|
| + // Creates network transaction factory.
|
| + scoped_ptr<net::HttpCache> CreateHttpFactory(
|
| + net::HttpNetworkSession* shared_session,
|
| + net::HttpCache::BackendFactory* backend) const;
|
|
|
| void SetCookieSettingsForTesting(CookieSettings* cookie_settings);
|
|
|
| @@ -384,6 +392,9 @@ class ProfileIOData {
|
| virtual bool AllowMicAccess(const GURL& origin) OVERRIDE;
|
| virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE;
|
| virtual SaltCallback GetMediaDeviceIDSalt() OVERRIDE;
|
| + virtual void SetNetworkState(
|
| + const std::string& client_id,
|
| + bool offline) OVERRIDE;
|
|
|
| private:
|
| friend class ProfileIOData;
|
| @@ -557,6 +568,8 @@ class ProfileIOData {
|
| mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_;
|
| #endif
|
|
|
| + mutable scoped_ptr<DevToolsNetworkController> network_controller_;
|
| +
|
| // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
|
| bool initialized_on_UI_thread_;
|
|
|
|
|