Data Reduction Proxy: Remove duplicate functions

components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.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 "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 85 matching lines @@
  private:
   base::MessageLoopForIO loop_;
   net::TestDelegate delegate_;
   net::TestURLRequestContext context_;
   net::NetLog net_log_;
   TestingPrefServiceSimple prefs_;
 };
 
 TEST_F(DataReductionProxyIODataTest, TestConstruction) {
   std::unique_ptr<DataReductionProxyIOData> io_data(
-      new DataReductionProxyIOData(Client::UNKNOWN, 0, net_log(), task_runner(),
+      new DataReductionProxyIOData(Client::UNKNOWN, net_log(), task_runner(),
                                    task_runner(), false /* enabled */,
                                    std::string() /* user_agent */,
                                    std::string() /* channel */));
 
   // Check that the SimpleURLRequestContextGetter uses vanilla HTTP.
   net::URLRequestContext* request_context =
       io_data->basic_url_request_context_getter_.get()->GetURLRequestContext();
   const net::HttpNetworkSession::Params* http_params =
       request_context->GetNetworkSessionParams();
   EXPECT_FALSE(http_params->enable_http2);
@@ skipping 29 matching lines @@
                                  true);
   EXPECT_NE(nullptr, io_data->bypass_stats());
 
   io_data->ShutdownOnUIThread();
 }
 
 TEST_F(DataReductionProxyIODataTest, TestResetBadProxyListOnDisableDataSaver) {
   net::TestURLRequestContext context(false);
   std::unique_ptr<DataReductionProxyTestContext> drp_test_context =
       DataReductionProxyTestContext::Builder()
-          .WithParamsFlags(DataReductionProxyParams::kPromoAllowed)
           .WithURLRequestContext(&context)
           .SkipSettingsInitialization()
           .Build();
 
   drp_test_context->SetDataReductionProxyEnabled(true);
   drp_test_context->InitSettings();
   DataReductionProxyIOData* io_data = drp_test_context->io_data();
   std::vector<net::ProxyServer> proxies;
   proxies.push_back(net::ProxyServer::FromURI("http://foo1.com",
                                               net::ProxyServer::SCHEME_HTTP));
@@ skipping 17 matching lines @@
   // Turn Data Saver off.
   drp_test_context->settings()->SetDataReductionProxyEnabled(false);
   base::RunLoop().RunUntilIdle();
 
   // Verify that bad proxy list is empty.
   EXPECT_EQ(0UL, bad_proxy_list.size());
 }
 
 TEST_F(DataReductionProxyIODataTest, HoldbackConfiguresProxies) {
   net::TestURLRequestContext context(false);
+  base::FieldTrialList field_trial_list(nullptr);
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "DataCompressionProxyHoldback", "Enabled"));
   std::unique_ptr<DataReductionProxyTestContext> drp_test_context =
       DataReductionProxyTestContext::Builder()
-          .WithParamsFlags(DataReductionProxyParams::kPromoAllowed |
-                           DataReductionProxyParams::kHoldback)
           .WithURLRequestContext(&context)
           .SkipSettingsInitialization()
           .Build();
 
   EXPECT_TRUE(drp_test_context->test_params()->proxies_for_http().size() > 0);
   EXPECT_FALSE(drp_test_context->test_params()
                    ->proxies_for_http()
                    .front()
                    .proxy_server()
                    .is_direct());
 }
 
 }  // namespace data_reduction_proxy