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 ffd1d79f23448872952455a3cb909d8cf6ad2fa4..b8f0dc1772ee2b9d89e7a1a37e1261ced85e5378 100644 |
--- a/chrome/browser/profiles/profile_io_data.h |
+++ b/chrome/browser/profiles/profile_io_data.h |
@@ -22,6 +22,7 @@ |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/storage_partition_descriptor.h" |
#include "chrome/common/content_settings_types.h" |
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h" |
#include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h" |
#include "content/public/browser/content_browser_client.h" |
#include "content/public/browser/resource_context.h" |
@@ -341,14 +342,15 @@ class ProfileIOData { |
void InitializeOnUIThread(Profile* profile); |
void ApplyProfileParamsToContext(ChromeURLRequestContext* context) const; |
-#if defined(OS_ANDROID) |
-#if defined(SPDY_PROXY_AUTH_ORIGIN) |
- void SetDataReductionProxyUsageStatsOnIOThread(IOThread* io_thread, |
- Profile* profile); |
- void SetDataReductionProxyUsageStatsOnUIThread(Profile* profile, |
+ // Setup data reduction proxy for given profile with params and usage_stats |
+ // from io thread globals. |
bengr
2014/07/18 19:41:44
for given --> for the given
params --> |params|
u
Not at Google. Contact bengr
2014/07/21 17:46:25
Done.
|
+ void SetupDataReductionProxyOnIOThread(IOThread* io_thread, |
+ Profile* profile); |
+ |
+ // Setup data reduction proxy for given profile, params, and usage_stats. |
bengr
2014/07/18 19:41:44
Say something about ownership. Is ownership retain
Not at Google. Contact bengr
2014/07/21 17:46:25
As discussed, I no longer instantiate the settings
|
+ void SetupDataReductionProxyOnUIThread(Profile* profile, |
+ data_reduction_proxy::DataReductionProxyParams* params, |
data_reduction_proxy::DataReductionProxyUsageStats* usage_stats); |
-#endif |
-#endif |
scoped_ptr<net::URLRequestJobFactory> SetUpJobFactoryDefaults( |
scoped_ptr<net::URLRequestJobFactoryImpl> job_factory, |
@@ -619,6 +621,9 @@ class ProfileIOData { |
const Profile::ProfileType profile_type_; |
+ scoped_ptr<data_reduction_proxy::DataReductionProxySettings> |
bengr
2014/07/18 19:41:44
Shouldn't this only be declared for non-Android/iO
Not at Google. Contact bengr
2014/07/21 17:46:25
Removed.
|
+ data_reduction_proxy_settings_; |
bengr
2014/07/18 19:41:44
Optional: Style isn't clear on whether the second
Not at Google. Contact bengr
2014/07/21 17:46:25
Removed.
I thought this would be treated like any
|
+ |
DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
}; |