Data Reduction Proxy: Remove duplicate functions

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

 // Copyright 2013 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_settings_android.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 43 matching lines @@
 
   // Returns the provided setting object. Used by wrapping methods.
   DataReductionProxySettings* Settings() override { return settings_; }
 
   // The wrapped settings object.
   DataReductionProxySettings* settings_;
 };
 
 template <class C>
 void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings(
-    std::unique_ptr<base::Clock> clock,
-    bool promo_allowed,
-    bool holdback) {
-  int flags = 0;
-  if (promo_allowed)
-    flags |= DataReductionProxyParams::kPromoAllowed;
-  if (holdback)
-    flags |= DataReductionProxyParams::kHoldback;
+    std::unique_ptr<base::Clock> clock) {
   MockDataReductionProxySettings<C>* settings =
       new MockDataReductionProxySettings<C>();
   settings->config_ = test_context_->config();
-  test_context_->config()->ResetParamFlagsForTest(flags);
-  settings->UpdateConfigValues();
+  test_context_->config()->ResetParamFlagsForTest();
   EXPECT_CALL(*settings, GetOriginalProfilePrefs())
       .Times(AnyNumber())
       .WillRepeatedly(Return(test_context_->pref_service()));
   EXPECT_CALL(*settings, GetLocalStatePrefs())
       .Times(AnyNumber())
       .WillRepeatedly(Return(test_context_->pref_service()));
   settings_.reset(settings);
   settings_->data_reduction_proxy_service_ =
       test_context_->CreateDataReductionProxyService(settings_.get());
 }
 
 template void
 data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings<
-    DataReductionProxyChromeSettings>(std::unique_ptr<base::Clock> clock,
-                                      bool promo_allowed,
-                                      bool holdback);
+    DataReductionProxyChromeSettings>(std::unique_ptr<base::Clock> clock);
 
 class DataReductionProxySettingsAndroidTest
     : public data_reduction_proxy::ConcreteDataReductionProxySettingsTest<
           DataReductionProxyChromeSettings> {
  public:
   // DataReductionProxySettingsTest implementation:
   void SetUp() override {
     env_ = base::android::AttachCurrentThread();
     DataReductionProxySettingsAndroid::Register(env_);
     DataReductionProxySettingsTestBase::SetUp();
@@ skipping 28 matching lines @@
             java_array_len);
 
   jlong value;
   for (size_t i = 0; i < data_reduction_proxy::kNumDaysInHistory; ++i) {
     env_->GetLongArrayRegion(result.obj(), i, 1, &value);
     ASSERT_EQ(
         static_cast<long>(
             (data_reduction_proxy::kNumDaysInHistory - 1 - i) * 2), value);
   }
 }