Chromium Code Reviews| 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 ba57faf3df4123397e484eb063271a78fd0ca27f..ec95c7d9b3ac00c5d6c211e9ad4105db29382651 100644 |
| --- a/chrome/browser/profiles/profile_io_data.h |
| +++ b/chrome/browser/profiles/profile_io_data.h |
| @@ -95,9 +95,10 @@ class ProfileIOData { |
| scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
| chrome_devtools_protocol_handler) const; |
| + net::CookieStore* GetExtensionsCookieStore() const; |
| + |
| ChromeURLRequestContext* GetMainRequestContext() const; |
| ChromeURLRequestContext* GetMediaRequestContext() const; |
| - ChromeURLRequestContext* GetExtensionsRequestContext() const; |
| ChromeURLRequestContext* GetIsolatedAppRequestContext( |
| ChromeURLRequestContext* main_context, |
| const StoragePartitionDescriptor& partition_descriptor, |
| @@ -159,10 +160,6 @@ class ProfileIOData { |
| return &one_click_signin_rejected_email_list_; |
| } |
| - ChromeURLRequestContext* extensions_request_context() const { |
|
awong
2013/07/31 00:51:18
There were 2 accessors for the same field in this
|
| - return extensions_request_context_.get(); |
| - } |
| - |
| BooleanPrefMember* safe_browsing_enabled() const { |
| return &safe_browsing_enabled_; |
| } |
| @@ -397,9 +394,6 @@ class ProfileIOData { |
| scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
| chrome_devtools_protocol_handler) const = 0; |
| - // Initializes the RequestContext for extensions. |
| - virtual void InitializeExtensionsRequestContext( |
| - ProfileParams* profile_params) const = 0; |
| // Does an on-demand initialization of a RequestContext for the given |
| // isolated app. |
| virtual ChromeURLRequestContext* InitializeAppRequestContext( |
| @@ -530,7 +524,9 @@ class ProfileIOData { |
| // These are only valid in between LazyInitialize() and their accessor being |
| // called. |
| mutable scoped_ptr<ChromeURLRequestContext> main_request_context_; |
| - mutable scoped_ptr<ChromeURLRequestContext> extensions_request_context_; |
| + protected: |
| + mutable scoped_refptr<net::CookieStore> extension_cookie_store_; |
| + private: |
| // One URLRequestContext per isolated app for main and media requests. |
| mutable URLRequestContextMap app_request_context_map_; |
| mutable URLRequestContextMap isolated_media_request_context_map_; |