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..2d6310e27bcab7c74524926de2f7d2c2ecebc16d 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
@@ -10,26 +10,110 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+using testing::_;
+
 namespace data_reduction_proxy {
 
-MockDataReductionProxyConfig::MockDataReductionProxyConfig()
-    : MockDataReductionProxyConfig(DataReductionProxyParams::kAllowed |
-                                   DataReductionProxyParams::kFallbackAllowed |
-                                   DataReductionProxyParams::kPromoAllowed) {
-}
-
-MockDataReductionProxyConfig::MockDataReductionProxyConfig(int flags)
-    : DataReductionProxyConfig(
-          scoped_ptr<TestDataReductionProxyParams>(
-              new TestDataReductionProxyParams(
-                  flags,
-                  TestDataReductionProxyParams::HAS_EVERYTHING &
-                      ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
-                      ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN))
-              .Pass()) {
+TestDataReductionProxyConfig::TestDataReductionProxyConfig(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    net::NetLog* net_log,
+    DataReductionProxyConfigurator* configurator,
+    DataReductionProxyEventStore* event_store)
+    : TestDataReductionProxyConfig(
+          DataReductionProxyParams::kAllowed |
+              DataReductionProxyParams::kFallbackAllowed |
+              DataReductionProxyParams::kPromoAllowed,
+          TestDataReductionProxyParams::HAS_EVERYTHING &
+              ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
+              ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN,
+          task_runner,
+          net_log,
+          configurator,
+          event_store) {
+}
+
+TestDataReductionProxyConfig::TestDataReductionProxyConfig(
+    int params_flags,
+    unsigned int params_definitions,
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    net::NetLog* net_log,
+    DataReductionProxyConfigurator* configurator,
+    DataReductionProxyEventStore* event_store)
+    : DataReductionProxyConfig(task_runner,
+                               task_runner,
+                               net_log,
+                               make_scoped_ptr(new TestDataReductionProxyParams(
+                                                   params_flags,
+                                                   params_definitions)).Pass(),
+                               configurator,
+                               event_store) {
   network_interfaces_.reset(new net::NetworkInterfaceList());
 }
 
+TestDataReductionProxyConfig::~TestDataReductionProxyConfig() {
+}
+
+void TestDataReductionProxyConfig::GetNetworkList(
+    net::NetworkInterfaceList* interfaces,
+    int policy) {
+  if (!network_interfaces_.get())
+    return;
+  for (size_t i = 0; i < network_interfaces_->size(); ++i)
+    interfaces->push_back(network_interfaces_->at(i));
+}
+
+void TestDataReductionProxyConfig::ResetParamFlagsForTest(int flags) {
+  params_ = make_scoped_ptr(
+                new TestDataReductionProxyParams(
+                    flags,
+                    TestDataReductionProxyParams::HAS_EVERYTHING &
+                        ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
+                        ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN))
+                .Pass();
+}
+
+TestDataReductionProxyParams* TestDataReductionProxyConfig::test_params() {
+  return static_cast<TestDataReductionProxyParams*>(params_.get());
+}
+
+void TestDataReductionProxyConfig::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);
+}
+
+MockDataReductionProxyConfig::MockDataReductionProxyConfig(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    net::NetLog* net_log,
+    DataReductionProxyConfigurator* configurator,
+    DataReductionProxyEventStore* event_store)
+    : TestDataReductionProxyConfig(task_runner,
+                                   net_log,
+                                   configurator,
+                                   event_store) {
+}
+
+MockDataReductionProxyConfig::MockDataReductionProxyConfig(
+    int params_flags,
+    unsigned int params_definitions,
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    net::NetLog* net_log,
+    DataReductionProxyConfigurator* configurator,
+    DataReductionProxyEventStore* event_store)
+    : TestDataReductionProxyConfig(params_flags,
+                                   params_definitions,
+                                   task_runner,
+                                   net_log,
+                                   configurator,
+                                   event_store) {
+}
+
 MockDataReductionProxyConfig::~MockDataReductionProxyConfig() {
 }
 
@@ -42,13 +126,10 @@ void MockDataReductionProxyConfig::SetProxyConfigs(bool enabled,
                                             restricted, at_startup);
 }
 
-void MockDataReductionProxyConfig::GetNetworkList(
-    net::NetworkInterfaceList* interfaces,
-    int policy) {
-  if (!network_interfaces_.get())
-    return;
-  for (size_t i = 0; i < network_interfaces_->size(); ++i)
-    interfaces->push_back(network_interfaces_->at(i));
+void MockDataReductionProxyConfig::HandleProbeResponse(
+    const std::string& response,
+    const net::URLRequestStatus& status) {
+  DataReductionProxyConfig::HandleProbeResponse(response, status);
 }
 
 }  // namespace data_reduction_proxy