Use data reduction proxy when managed proxy config returns direct

components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.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 "components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 128 matching lines @@
   EXPECT_CALL(*settings, GetOriginalProfilePrefs())
       .Times(AnyNumber())
       .WillRepeatedly(Return(&pref_service_));
   EXPECT_CALL(*settings, GetLocalStatePrefs())
       .Times(AnyNumber())
       .WillRepeatedly(Return(&pref_service_));
   EXPECT_CALL(*settings, GetURLFetcherForAvailabilityCheck()).Times(0);
   EXPECT_CALL(*settings, GetURLFetcherForWarmup()).Times(0);
   EXPECT_CALL(*settings, LogProxyState(_, _, _)).Times(0);
   settings_.reset(settings);
-  settings_->configurator_.reset(new TestDataReductionProxyConfig());
+  configurator_.reset(new TestDataReductionProxyConfig());
+  settings_->configurator_ = configurator_.get();
 }
 
 // Explicitly generate required instantiations.
 template void
 DataReductionProxySettingsTestBase::ResetSettings<DataReductionProxySettings>(
     bool allowed,
     bool fallback_allowed,
     bool alt_allowed,
     bool promo_allowed,
     bool holdback);
@@ skipping 43 matching lines @@
     const std::string& response,
     ProbeURLFetchResult result,
     bool success,
     int expected_calls);
 
 void DataReductionProxySettingsTestBase::CheckProxyConfigs(
     bool expected_enabled,
     bool expected_restricted,
     bool expected_fallback_restricted) {
   TestDataReductionProxyConfig* config =
-      static_cast<TestDataReductionProxyConfig*>(
-          settings_->configurator_.get());
+      static_cast<TestDataReductionProxyConfig*>(settings_->configurator_);
   ASSERT_EQ(expected_restricted, config->restricted_);
   ASSERT_EQ(expected_fallback_restricted, config->fallback_restricted_);
   ASSERT_EQ(expected_enabled, config->enabled_);
 }
 
 void DataReductionProxySettingsTestBase::CheckProbe(
     bool initially_enabled,
     const std::string& probe_url,
     const std::string& warmup_url,
     const std::string& response,
@@ skipping 65 matching lines @@
     bool enabled_at_startup) {
   base::MessageLoopForUI loop;
   SetProbeResult(kProbeURLWithOKResponse,
                  kWarmupURLWithNoContentResponse,
                  "OK",
                  FetchResult(enabled_at_startup, true),
                  true,
                  enabled_at_startup ? 1 : 0);
   scoped_ptr<DataReductionProxyConfigurator> configurator(
       new TestDataReductionProxyConfig());
-  settings_->SetProxyConfigurator(configurator.Pass());
+  settings_->SetProxyConfigurator(configurator.get());
   scoped_refptr<net::TestURLRequestContextGetter> request_context =
       new net::TestURLRequestContextGetter(base::MessageLoopProxy::current());
 
   settings_->InitDataReductionProxySettings(
       &pref_service_,
       &pref_service_,
       request_context.get());
   settings_->SetOnDataReductionEnabledCallback(
       base::Bind(&DataReductionProxySettingsTestBase::
                  RegisterSyntheticFieldTrialCallback,
                  base::Unretained(this)));
 
   base::MessageLoop::current()->RunUntilIdle();
   CheckProxyConfigs(enabled_at_startup, false, false);
   EXPECT_EQ(enabled_at_startup, proxy_enabled_);
 }
 
 }  // namespace data_reduction_proxy