| Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc
|
| diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc
|
| index c855b7abf876f20bb1d594540a3fffdc0bc5d51f..9e3070c8600dd68fbad48e4617bb7277cd1adecd 100644
|
| --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc
|
| +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc
|
| @@ -13,6 +13,10 @@
|
| #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
|
| #include "content/public/browser/browser_thread.h"
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "base/android/build_info.h"
|
| +#endif
|
| +
|
| using content::BrowserThread;
|
| using data_reduction_proxy::DataReductionProxyParams;
|
| using data_reduction_proxy::DataReductionProxyUsageStats;
|
| @@ -59,6 +63,12 @@ KeyedService* DataReductionProxyChromeSettingsFactory::BuildServiceInstanceFor(
|
| flags |= DataReductionProxyParams::kPromoAllowed;
|
| if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial())
|
| flags |= DataReductionProxyParams::kHoldback;
|
| +#if defined(OS_ANDROID)
|
| + if (DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial(
|
| + base::android::BuildInfo::GetInstance()->android_build_fp())) {
|
| + flags |= DataReductionProxyParams::kPromoAllowed;
|
| + }
|
| +#endif
|
|
|
| return new DataReductionProxyChromeSettings(
|
| new DataReductionProxyParams(flags));
|
|
|