Added flag to enable the data reduction proxy alternative

chrome/browser/io_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 618 matching lines @@
   }
 
   globals_->ssl_config_service = GetSSLConfigService();
 
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
   int drp_flags = 0;
   if (data_reduction_proxy::DataReductionProxyParams::
           IsIncludedInFieldTrial()) {
     drp_flags |=
         (data_reduction_proxy::DataReductionProxyParams::kAllowed |
-         data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed);
-  }
-  if (data_reduction_proxy::DataReductionProxyParams::
-          IsIncludedInAlternativeFieldTrial()) {
-    drp_flags |=
-        data_reduction_proxy::DataReductionProxyParams::kAlternativeAllowed;
+         data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed |
+         data_reduction_proxy::DataReductionProxyParams::kAlternativeAllowed);
   }
   if (data_reduction_proxy::DataReductionProxyParams::
           IsIncludedInPromoFieldTrial())
     drp_flags |= data_reduction_proxy::DataReductionProxyParams::kPromoAllowed;
   if (data_reduction_proxy::DataReductionProxyParams::
           IsIncludedInHoldbackFieldTrial())
     drp_flags |= data_reduction_proxy::DataReductionProxyParams::kHoldback;
   globals_->data_reduction_proxy_params.reset(
       new data_reduction_proxy::DataReductionProxyParams(drp_flags));
   globals_->data_reduction_proxy_auth_request_handler.reset(
@@ skipping 776 matching lines @@
   net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
   for (size_t i = 0; i < supported_versions.size(); ++i) {
     net::QuicVersion version = supported_versions[i];
     if (net::QuicVersionToString(version) == quic_version) {
       return version;
     }
   }
 
   return net::QUIC_VERSION_UNSUPPORTED;
 }