| Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc
|
| diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc
|
| index 04cd7737cf32cf5284a87f34d28d5ccb2e9ad581..c36249a62f1044a5f6b96e42afb0f65e69998c9b 100644
|
| --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc
|
| +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc
|
| @@ -33,10 +33,6 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "url/gurl.h"
|
|
|
| -#if defined(OS_ANDROID)
|
| -#include "base/android/build_info.h"
|
| -#endif
|
| -
|
| namespace content {
|
| class BrowserContext;
|
| }
|
| @@ -84,25 +80,13 @@ CreateDataReductionProxyChromeIOData(
|
| DCHECK(net_log);
|
| DCHECK(prefs);
|
|
|
| - int flags = 0;
|
| - if (data_reduction_proxy::params::IsIncludedInPromoFieldTrial())
|
| - flags |= DataReductionProxyParams::kPromoAllowed;
|
| - if (data_reduction_proxy::params::IsIncludedInHoldbackFieldTrial())
|
| - flags |= DataReductionProxyParams::kHoldback;
|
| -#if defined(OS_ANDROID)
|
| - if (data_reduction_proxy::params::IsIncludedInAndroidOnePromoFieldTrial(
|
| - base::android::BuildInfo::GetInstance()->android_build_fp())) {
|
| - flags |= DataReductionProxyParams::kPromoAllowed;
|
| - }
|
| -#endif
|
| -
|
| bool enabled =
|
| prefs->GetBoolean(prefs::kDataSaverEnabled) ||
|
| data_reduction_proxy::params::ShouldForceEnableDataReductionProxy();
|
| std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData>
|
| data_reduction_proxy_io_data(
|
| new data_reduction_proxy::DataReductionProxyIOData(
|
| - DataReductionProxyChromeSettings::GetClient(), flags, net_log,
|
| + DataReductionProxyChromeSettings::GetClient(), net_log,
|
| io_task_runner, ui_task_runner, enabled, GetUserAgent(),
|
| version_info::GetChannelString(chrome::GetChannel())));
|
|
|
|
|