Data Reduction Proxy class ownership updates and Settings cleanup

components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
index 03ba9d6b00049b26d3bdbb1e4c770c48febffa1c..7a9d74bf4f3ca5aaf8d7226c3f0909f2bdae74a7 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
@@ -12,21 +12,36 @@
 
 namespace data_reduction_proxy {
 
-MockDataReductionProxyConfig::MockDataReductionProxyConfig()
-    : MockDataReductionProxyConfig(DataReductionProxyParams::kAllowed |
-                                   DataReductionProxyParams::kFallbackAllowed |
-                                   DataReductionProxyParams::kPromoAllowed) {
-}
+MockDataReductionProxyConfig::MockDataReductionProxyConfig(
+    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
+    net::NetLog* net_log,
+    DataReductionProxyConfigurator* configurator,
+    DataReductionProxyEventStore* event_store)
+    : MockDataReductionProxyConfig(
+        DataReductionProxyParams::kAllowed |
+            DataReductionProxyParams::kFallbackAllowed |
+            DataReductionProxyParams::kPromoAllowed,
+        network_task_runner,
+        net_log,
+        configurator,
+        event_store) {}

[bengr, 2015/02/03 21:51:58]

end curly on new line.

[jeremyim, 2015/02/04 01:31:21]

Done.

 
-MockDataReductionProxyConfig::MockDataReductionProxyConfig(int flags)
+MockDataReductionProxyConfig::MockDataReductionProxyConfig(
+    int flags,
+    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
+    net::NetLog* net_log,
+    DataReductionProxyConfigurator* configurator,
+    DataReductionProxyEventStore* event_store)
     : DataReductionProxyConfig(
-          scoped_ptr<TestDataReductionProxyParams>(
-              new TestDataReductionProxyParams(
-                  flags,
-                  TestDataReductionProxyParams::HAS_EVERYTHING &
-                      ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
-                      ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN))
-              .Pass()) {
+        network_task_runner,
+        net_log,
+        scoped_ptr<DataReductionProxyParams>(new TestDataReductionProxyParams(
+            flags,
+            TestDataReductionProxyParams::HAS_EVERYTHING &
+                ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
+                ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN)).Pass(),
+        configurator,
+        event_store) {
   network_interfaces_.reset(new net::NetworkInterfaceList());
 }
 
@@ -51,4 +66,30 @@ void MockDataReductionProxyConfig::GetNetworkList(
     interfaces->push_back(network_interfaces_->at(i));
 }
 
+void MockDataReductionProxyConfig::ResetParamsForTest(int flags) {
+  params_.reset(scoped_ptr<DataReductionProxyParams>(
+      new TestDataReductionProxyParams(
+          flags,
+          TestDataReductionProxyParams::HAS_EVERYTHING &
+              ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
+              ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN))
+      .release());
+}
+
+TestDataReductionProxyParams* MockDataReductionProxyConfig::test_params() {
+  return static_cast<TestDataReductionProxyParams*>(params_.get());
+}
+
+void MockDataReductionProxyConfig::SetStateForTest(
+    bool enabled_by_user,
+    bool alternative_enabled_by_user,
+    bool restricted_by_carrier,
+    bool at_startup) {
+  enabled_by_user_ = enabled_by_user;
+  alternative_enabled_by_user_ = alternative_enabled_by_user;
+  restricted_by_carrier_ = restricted_by_carrier;
+  SetProxyConfigs(enabled_by_user_, alternative_enabled_by_user_,
+                  restricted_by_carrier_, at_startup);
+}
+
 }  // namespace data_reduction_proxy