Revert 158894 - Disable TLS channel ID by default. (for merging to branch)

net/base/ssl_config_service.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 "net/base/ssl_config_service.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "net/base/crl_set.h"
@@ skipping 20 matching lines @@
 
 SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {}
 
 SSLConfig::CertAndStatus::~CertAndStatus() {}
 
 SSLConfig::SSLConfig()
     : rev_checking_enabled(false),
       version_min(g_default_version_min),
       version_max(g_default_version_max),
       cached_info_enabled(false),
-      channel_id_enabled(false),
+      channel_id_enabled(true),
       false_start_enabled(true),
       send_client_cert(false),
       verify_ev_cert(false),
       version_fallback(false),
       cert_io_enabled(true) {
 }
 
 SSLConfig::~SSLConfig() {
 }
 
@@ skipping 115 matching lines @@
 bool SSLConfigService::IsSNIAvailable(SSLConfigService* service) {
   if (!service)
     return false;
 
   SSLConfig ssl_config;
   service->GetSSLConfig(&ssl_config);
   return ssl_config.version_max >= SSL_PROTOCOL_VERSION_TLS1;
 }
 
 }  // namespace net