Data Reduction Proxy class ownership updates and Settings cleanup

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc

 // Copyright 2014 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_settings_factory.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h"
-#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #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;
 
 // static
 DataReductionProxyChromeSettings*
 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
     content::BrowserContext* context) {
   return static_cast<DataReductionProxyChromeSettings*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
@@ skipping 16 matching lines @@
         "DataReductionProxyChromeSettings",
         BrowserContextDependencyManager::GetInstance()) {
 }
 
 DataReductionProxyChromeSettingsFactory::
     ~DataReductionProxyChromeSettingsFactory() {
 }
 
 KeyedService* DataReductionProxyChromeSettingsFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  int flags = DataReductionProxyParams::kAllowed |
-      DataReductionProxyParams::kFallbackAllowed |
-      DataReductionProxyParams::kAlternativeAllowed;
-  if (DataReductionProxyParams::IsIncludedInPromoFieldTrial())
-    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(
-      scoped_ptr<DataReductionProxyParams>(new DataReductionProxyParams(flags))
-          .Pass());
+  return new DataReductionProxyChromeSettings();
 }