Remove DataCompressionProxyDevRollout experiment

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 4e94d36bf10013e903b093678dfcaa845d6437a2..d4eedb0f1b1641b5fe8dab819f0c15fc0043b6d0 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
@@ -34,8 +34,6 @@ const char kDefaultQuicOrigin[] = "quic://proxy.googlezip.net:443";
 // available.
 const char kCarrierTestOrigin[] =
     "http://o-o.preferred.nttdocomodcp-hnd1.proxy-dev.googlezip.net:80";
-const char kDevOrigin[] = "https://proxy-dev.googlezip.net:443";
-const char kDevFallbackOrigin[] = "proxy-dev.googlezip.net:80";
 const char kDefaultFallbackOrigin[] = "compress.googlezip.net:80";
 const char kDefaultSecureProxyCheckUrl[] = "http://check.googlezip.net/connect";
 const char kDefaultWarmupUrl[] = "http://www.gstatic.com/generate_204";
@@ -43,7 +41,6 @@ const char kDefaultWarmupUrl[] = "http://www.gstatic.com/generate_204";
 const char kAndroidOneIdentifier[] = "sprout";
 
 const char kQuicFieldTrial[] = "DataReductionProxyUseQuic";
-const char kDevRolloutFieldTrial[] = "DataCompressionProxyDevRollout";
 
 const char kLoFiFieldTrial[] = "DataCompressionProxyLoFi";
 const char kLoFiFlagFieldTrial[] = "DataCompressionProxyLoFiFlag";
@@ -174,16 +171,6 @@ std::string GetQuicFieldTrialName() {
   return kQuicFieldTrial;
 }
 
-bool IsDevRolloutEnabled() {
-  const base::CommandLine& command_line =
-      *base::CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kDisableDataReductionProxyDev))
-    return false;
-
-  return command_line.HasSwitch(switches::kEnableDataReductionProxyDev) ||
-         (FieldTrialList::FindFullName(kDevRolloutFieldTrial) == kEnabled);
-}
-
 bool IsConfigClientEnabled() {
   // Config client is enabled by default. It can be disabled only if Chromium
   // belongs to a field trial group whose name starts with "Disabled".
@@ -306,8 +293,7 @@ std::string GetServerExperimentsFieldTrialName() {
 void DataReductionProxyParams::EnableQuic(bool enable) {
   quic_enabled_ = enable;
   DCHECK(!quic_enabled_ || params::IsIncludedInQuicFieldTrial());
-  if (!params::IsDevRolloutEnabled() && override_quic_origin_.empty() &&
-      quic_enabled_) {
+  if (override_quic_origin_.empty() && quic_enabled_) {
     origin_ = net::ProxyServer::FromURI(kDefaultQuicOrigin,
                                         net::ProxyServer::SCHEME_HTTP);
     proxies_for_http_.clear();
@@ -393,12 +379,7 @@ void DataReductionProxyParams::InitWithoutChecks() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   std::string origin;
-  if (!command_line.HasSwitch(switches::kDisableDataReductionProxyDev)) {
-      origin = command_line.GetSwitchValueASCII(
-          switches::kDataReductionProxyDev);
-  }
-  if (origin.empty())
-    origin = command_line.GetSwitchValueASCII(switches::kDataReductionProxy);
+  origin = command_line.GetSwitchValueASCII(switches::kDataReductionProxy);
   std::string fallback_origin =
       command_line.GetSwitchValueASCII(switches::kDataReductionProxyFallback);
   std::string ssl_origin =
@@ -419,14 +400,10 @@ void DataReductionProxyParams::InitWithoutChecks() {
 
   // Set from preprocessor constants those params that are not specified on the
   // command line.
-  if (origin.empty())
-    origin = GetDefaultDevOrigin();
   override_quic_origin_ = origin;
   if (origin.empty())
     origin = GetDefaultOrigin();
   if (fallback_origin.empty())
-    fallback_origin = GetDefaultDevFallbackOrigin();
-  if (fallback_origin.empty())
     fallback_origin = GetDefaultFallbackOrigin();
   if (ssl_origin.empty())
     ssl_origin = GetDefaultSSLOrigin();
@@ -498,14 +475,6 @@ bool DataReductionProxyParams::holdback() const {
   return holdback_;
 }
 
-std::string DataReductionProxyParams::GetDefaultDevOrigin() const {
-  return params::IsDevRolloutEnabled() ? kDevOrigin : std::string();
-}
-
-std::string DataReductionProxyParams::GetDefaultDevFallbackOrigin() const {
-  return params::IsDevRolloutEnabled() ? kDevFallbackOrigin : std::string();
-}
-
 // TODO(kundaji): Remove tests for macro definitions.
 std::string DataReductionProxyParams::GetDefaultOrigin() const {
   const base::CommandLine& command_line =