Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index f88e506700efe921e35196f6f9fa07f3faf73080..a46b8ed6e62e1ac13a4ee1036df9138c7772b75e 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -105,6 +105,10 @@ |
#include "net/ocsp/nss_ocsp.h" |
#endif |
+#if defined(OS_ANDROID) |
+#include "base/android/build_info.h" |
+#endif |
+ |
#if defined(OS_CHROMEOS) |
#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" |
#include "chromeos/network/host_resolver_impl_chromeos.h" |
@@ -1171,6 +1175,13 @@ void IOThread::SetupDataReductionProxy() { |
IsIncludedInHoldbackFieldTrial()) { |
flags |= data_reduction_proxy::DataReductionProxyParams::kHoldback; |
} |
+#if defined(OS_ANDROID) |
+ if (data_reduction_proxy::DataReductionProxyParams:: |
+ IsIncludedInAndroidOnePromoFieldTrial( |
+ base::android::BuildInfo::GetInstance()->android_build_fp())) { |
+ flags |= data_reduction_proxy::DataReductionProxyParams::kPromoAllowed; |
mmenke
2014/12/17 16:32:50
We already have data_reduction_proxy::DataReductio
jeremyim
2014/12/17 17:52:49
This will get cleaned up/refactored in bengr's CL
|
+ } |
+#endif |
globals_->data_reduction_proxy_params.reset( |
new data_reduction_proxy::DataReductionProxyParams(flags)); |
globals_->data_reduction_proxy_auth_request_handler.reset( |