Add the ability to use DataReductionProxyParams from DataReductionProxyConfigServiceClient.

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 03676c96fe89d76708c72b73711fe7d6e1630dfd..f6e836c4d08230ff0634f09f76b8cf5ea64e2f83 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
@@ -4,6 +4,7 @@
 
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h"
 
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
 #include "net/base/net_util.h"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ -21,12 +22,28 @@ TestDataReductionProxyConfig::TestDataReductionProxyConfig(
     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) {
+    : TestDataReductionProxyConfig(
+          make_scoped_ptr(
+              new TestDataReductionProxyParams(params_flags,
+                                               params_definitions)).Pass(),
+          task_runner,
+          net_log,
+          configurator,
+          event_store) {
+}
+
+TestDataReductionProxyConfig::TestDataReductionProxyConfig(
+    scoped_ptr<DataReductionProxyConfigValues> config_values,
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    net::NetLog* net_log,
+    DataReductionProxyConfigurator* configurator,
+    DataReductionProxyEventStore* event_store)
+    : DataReductionProxyConfig(task_runner,
+                               task_runner,
+                               net_log,
+                               config_values.Pass(),
+                               configurator,
+                               event_store) {
   network_interfaces_.reset(new net::NetworkInterfaceList());
 }
 
@@ -58,28 +75,30 @@ TestDataReductionProxyParams* TestDataReductionProxyConfig::test_params() {
   return static_cast<TestDataReductionProxyParams*>(config_values_.get());
 }
 
+DataReductionProxyConfigValues* TestDataReductionProxyConfig::config_values() {
+  return config_values_.get();
+}
+
 void TestDataReductionProxyConfig::SetStateForTest(
     bool enabled_by_user,
     bool alternative_enabled_by_user,
-    bool restricted_by_carrier,
-    bool at_startup) {
+    bool restricted_by_carrier) {
   enabled_by_user_ = enabled_by_user;
   alternative_enabled_by_user_ = alternative_enabled_by_user;
   restricted_by_carrier_ = restricted_by_carrier;
-  UpdateConfigurator(enabled_by_user_, alternative_enabled_by_user_,
-                     restricted_by_carrier_, at_startup);
 }
 
 MockDataReductionProxyConfig::MockDataReductionProxyConfig(
-    int params_flags,
-    unsigned int params_definitions,
+    scoped_ptr<DataReductionProxyConfigValues> config_values,
     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) {
+    : TestDataReductionProxyConfig(config_values.Pass(),
+                                   task_runner,
+                                   net_log,
+                                   configurator,
+                                   event_store) {
 }
 
 MockDataReductionProxyConfig::~MockDataReductionProxyConfig() {