Data Reduction Proxy class ownership updates and Settings cleanup

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
+
+#if defined(OS_ANDROID)
+#include "base/android/build_info.h"
+#endif
 
 namespace content {
 class BrowserContext;
 }
 
+using data_reduction_proxy::DataReductionProxyParams;
+
 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
 CreateDataReductionProxyChromeIOData(
     net::NetLog* net_log,
     content::BrowserContext* browser_context,
     PrefService* prefs,
     const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
     const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) {
   DCHECK(net_log);
   DCHECK(prefs);
   DCHECK(browser_context);
@@ skipping 11 matching lines @@
 #else
   base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60);
 #endif
 
   data_reduction_proxy::DataReductionProxyStatisticsPrefs*
       data_reduction_proxy_statistics_prefs =
           new data_reduction_proxy::DataReductionProxyStatisticsPrefs(
               prefs, ui_task_runner,
               commit_delay);
 
+  int flags = DataReductionProxyParams::kAllowed;
+  flags |= DataReductionProxyParams::kFallbackAllowed |
+           DataReductionProxyParams::kAlternativeAllowed;
+  if (DataReductionProxyParams::IsIncludedInPromoFieldTrial())
+    flags |= DataReductionProxyParams::kPromoAllowed;
+  if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial())
+    flags |= DataReductionProxyParams::kHoldback;
+#if defined(OS_ANDROID)

[bengr, 2015/02/05 00:46:02]

This platform specialization will go away in a future CL, right? If so, add a
TODO(jeremyim) explaining

[jeremyim, 2015/02/05 00:59:52]

This specialization won't go away, since it's the Android One promo.

[bengr, 2015/02/05 01:35:11]

Fine.

+  if (DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial(
+          base::android::BuildInfo::GetInstance()->android_build_fp())) {
+    flags |= DataReductionProxyParams::kPromoAllowed;
+  }
+#endif
+
   scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
       data_reduction_proxy_io_data(
           new data_reduction_proxy::DataReductionProxyIOData(
               DataReductionProxyChromeSettings::GetClient(),
+              flags,
               make_scoped_ptr(data_reduction_proxy_statistics_prefs),
               settings,
               net_log,
               io_task_runner,
               ui_task_runner));
   data_reduction_proxy_io_data->InitOnUIThread(prefs);
   settings->SetDataReductionProxyStatisticsPrefs(
       data_reduction_proxy_statistics_prefs);
 
   return data_reduction_proxy_io_data.Pass();
 }