Add the ability to use DataReductionProxyParams from DataReductionProxyConfigServiceClient.

components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h
index 79c5548010bdd78dafef22d79e70d34df71a3482..28ae85995946e8b74c3f8ef36a02c7e24a52b0e9 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h
@@ -23,6 +23,7 @@ namespace data_reduction_proxy {
 
 class DataReductionProxyConfigurator;
 class DataReductionProxyEventStore;
+class DataReductionProxyMutableConfigValues;
 class TestDataReductionProxyParams;
 
 // Test version of |DataReductionProxyConfig|, which uses an underlying
@@ -39,6 +40,14 @@ class TestDataReductionProxyConfig : public DataReductionProxyConfig {
       net::NetLog* net_log,
       DataReductionProxyConfigurator* configurator,
       DataReductionProxyEventStore* event_store);
+
+  TestDataReductionProxyConfig(

[bengr, 2015/03/24 21:37:41]

Add comment that explains how this Constructor is different.

[jeremyim, 2015/03/24 23:20:28]

Done.

+      scoped_ptr<DataReductionProxyConfigValues> config_values,

[sclittle, 2015/03/24 21:34:55]

Could this be changed to scoped_ptr<DataReductionProxyMutableConfigValues>, to
ensure that it's mutable?

[jeremyim, 2015/03/24 23:20:28]

I actually pass TestDataReductionProxyParams in from the other constructor.

+      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+      net::NetLog* net_log,
+      DataReductionProxyConfigurator* configurator,
+      DataReductionProxyEventStore* event_store);
+
   ~TestDataReductionProxyConfig() override;
 
   void GetNetworkList(net::NetworkInterfaceList* interfaces,
@@ -53,11 +62,13 @@ class TestDataReductionProxyConfig : public DataReductionProxyConfig {
   // Retrieves the test params being used for the configuration.
   TestDataReductionProxyParams* test_params();
 
+  // Retrieves the mutable config values.
+  DataReductionProxyMutableConfigValues* mutable_config_values();
+
   // Allows tests to set the internal state.
   void SetStateForTest(bool enabled_by_user,
                        bool alternative_enabled_by_user,
-                       bool restricted_by_carrier,
-                       bool at_startup);
+                       bool restricted_by_carrier);
 
   net::NetworkInterfaceList* interfaces() {
     return network_interfaces_.get();
@@ -71,10 +82,9 @@ class TestDataReductionProxyConfig : public DataReductionProxyConfig {
 // testing.
 class MockDataReductionProxyConfig : public TestDataReductionProxyConfig {
  public:
-  // Creates a |MockDataReductionProxyConfig| with the provided |params_flags|.
+  // Creates a |MockDataReductionProxyConfig|.
   MockDataReductionProxyConfig(
-      int params_flags,
-      unsigned int params_definitions,
+      scoped_ptr<DataReductionProxyConfigValues> config_values,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
       net::NetLog* net_log,
       DataReductionProxyConfigurator* configurator,