Data Reduction Proxy class ownership updates and Settings cleanup

components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
index 26de12c3044d10d489dec033508ae65eea8865db..49e3ad2598e8626ecbdb84f68a7490e32ca8c022 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
@@ -10,8 +10,10 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
@@ -180,11 +182,11 @@ class DataReductionProxyInterceptorWithServerTest : public testing::Test {
     ASSERT_TRUE(proxy_.InitializeAndWaitUntilReady());
     ASSERT_TRUE(direct_.InitializeAndWaitUntilReady());
 
-    // Owned by settings_.
-    scoped_ptr<TestDataReductionProxyParams> params;
-    params.reset(new TestDataReductionProxyParams(
-        DataReductionProxyParams::kAllowed,
-        TestDataReductionProxyParams::HAS_EVERYTHING &
+    // Owned by io_data_->config_.
+    scoped_ptr<TestDataReductionProxyParams> params(
+        new TestDataReductionProxyParams(
+            DataReductionProxyParams::kAllowed,
+            TestDataReductionProxyParams::HAS_EVERYTHING &
             ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
             ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN));
     params->set_origin(proxy_.GetURL("/"));
@@ -196,7 +198,7 @@ class DataReductionProxyInterceptorWithServerTest : public testing::Test {
 
     context_.set_proxy_service(proxy_service_.get());
 
-    settings_.reset(new DataReductionProxySettings(params.Pass()));
+    settings_.reset(new DataReductionProxySettings());
     io_data_.reset(
         new DataReductionProxyIOData(
             data_reduction_proxy::Client::UNKNOWN,
@@ -206,6 +208,8 @@ class DataReductionProxyInterceptorWithServerTest : public testing::Test {
             &net_log_,
             loop_.message_loop_proxy(),
             loop_.message_loop_proxy()));
+    settings_->ResetConfigForTest(io_data_->config());
+    io_data_->config()->ResetParamsForTest(params.Pass());
 
     scoped_ptr<net::URLRequestJobFactoryImpl> job_factory_impl(
         new net::URLRequestJobFactoryImpl());