Data Reduction Proxy class ownership updates and Settings cleanup

components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
index 024ebd04f047923692063f65ff8eace2d74bc291..c7e65fd845b806a9bc6a83d68e518a3691644b4d 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
@@ -70,14 +70,21 @@ class DataReductionProxyConfigTest : public testing::Test {
       flags |= DataReductionProxyParams::kPromoAllowed;
     if (holdback)
       flags |= DataReductionProxyParams::kHoldback;
-    config_.reset(new MockDataReductionProxyConfig(flags));
+    configurator_.reset(new TestDataReductionProxyConfigurator(
+        scoped_refptr<base::TestSimpleTaskRunner>(
+            new base::TestSimpleTaskRunner()),
+        &net_log_, event_store_.get()));
     MockDataReductionProxyConfig* config =
-        static_cast<MockDataReductionProxyConfig*>(config_.get());
+        new MockDataReductionProxyConfig(
+            flags,
+            scoped_refptr<base::TestSimpleTaskRunner>(
+                new base::TestSimpleTaskRunner()),
+            &net_log_,
+            configurator_.get(),
+            event_store_.get());
     EXPECT_CALL(*config, GetURLFetcherForProbe()).Times(0);
     EXPECT_CALL(*config, LogProxyState(_, _, _)).Times(0);
-    config_->InitDataReductionProxyConfig(
-        task_runner_.get(), &net_log_, request_context_.get(),
-        configurator_.get(), event_store_.get());
+    config_.reset(config);
   }
 
   void SetProbeResult(const std::string& test_url,
@@ -134,14 +141,6 @@ class DataReductionProxyConfigTest : public testing::Test {
     return FAILED_PROXY_ALREADY_DISABLED;
   }
 
-  void CheckInitDataReductionProxy(bool enabled_at_startup) {
-    config_->InitDataReductionProxyConfig(
-        task_runner_.get(), &net_log_, request_context_.get(),
-        configurator_.get(), event_store_.get());
-
-    base::MessageLoop::current()->RunUntilIdle();
-  }
-
   MockDataReductionProxyConfig* config() { return config_.get(); }
 
   TestDataReductionProxyConfigurator* configurator() {