Enable DRP config service by default

components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc

Index: components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
index e8fe57c657d5ba7d90e853df854b49a106471cd9..8ce9ecca692fc9338e32271f4881b2d675e0945d 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
@@ -47,9 +47,6 @@ const char kDevRolloutFieldTrial[] = "DataCompressionProxyDevRollout";
 const char kLoFiFieldTrial[] = "DataCompressionProxyLoFi";
 const char kLoFiFlagFieldTrial[] = "DataCompressionProxyLoFiFlag";
 
-const char kConfigServiceFieldTrial[] = "DataReductionProxyConfigService";
-const char kConfigServiceURLParam[] = "url";
-
 const char kTrustedSpdyProxyFieldTrialName[] = "DataReductionTrustedSpdyProxy";
 
 // Default URL for retrieving the Data Reduction Proxy configuration.
@@ -186,18 +183,10 @@ bool IsDevRolloutEnabled() {
          (FieldTrialList::FindFullName(kDevRolloutFieldTrial) == kEnabled);
 }
 
-std::string GetClientConfigFieldTrialName() {
-  return kConfigServiceFieldTrial;
-}
-
 bool IsConfigClientEnabled() {
-  std::string group_value =
-      base::FieldTrialList::FindFullName(kConfigServiceFieldTrial);
-  base::StringPiece group = group_value;
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             data_reduction_proxy::switches::
-                 kEnableDataReductionProxyConfigClient) ||
-         group.starts_with(kEnabled);
+  // TODO(tbansal): crbug.com/597768 Remove the data reduction proxy deprecated
+  // code which was used when config client is not enabled.
+  return true;
 }
 
 GURL GetConfigServiceURL() {
@@ -208,11 +197,6 @@ GURL GetConfigServiceURL() {
         switches::kDataReductionProxyConfigURL);
   }
 
-  if (url.empty()) {
-    url = variations::GetVariationParamValue(kConfigServiceFieldTrial,
-                                             kConfigServiceURLParam);
-  }
-
   if (url.empty())
     return GURL(kClientConfigURL);