Enable TLS channeld id by default.

chrome/browser/chrome_browser_field_trials.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/chrome_browser_field_trials.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 109 matching lines @@
   ConnectBackupJobsFieldTrial();
   WarmConnectionFieldTrial();
   PredictorFieldTrial();
   DefaultAppsFieldTrial();
   AutoLaunchChromeFieldTrial();
   gpu_util::InitializeCompositingFieldTrial();
   SetupUniformityFieldTrials();
   AutocompleteFieldTrial::Activate();
   DisableNewTabFieldTrialIfNecesssary();
   SetUpSafeBrowsingInterstitialFieldTrial();
-  SetUpChannelIDFieldTrial();
   SetUpInfiniteCacheFieldTrial();
 }
 
 // This is an A/B test for the maximum number of persistent connections per
 // host. Currently Chrome, Firefox, and IE8 have this value set at 6. Safari
 // uses 4, and Fasterfox (a plugin for Firefox that supposedly configures it to
 // run faster) uses 8. We would like to see how much of an effect this value has
 // on browsing. Too large a value might cause us to run into SYN flood detection
 // mechanisms.
 void ChromeBrowserFieldTrials::ConnectionFieldTrial() {
@@ skipping 394 matching lines @@
 void ChromeBrowserFieldTrials::SetUpSafeBrowsingInterstitialFieldTrial() {
   const base::FieldTrial::Probability kDivisor = 100;
   const base::FieldTrial::Probability kVersion2Probability = 50;  // 50% prob.
   scoped_refptr<base::FieldTrial> trial(
       base::FieldTrialList::FactoryGetFieldTrial("SBInterstitial", kDivisor,
                                                  "V1", 2012, 9, 19, NULL));
   trial->UseOneTimeRandomization();
   trial->AppendGroup("V2", kVersion2Probability);
 }
 
-void ChromeBrowserFieldTrials::SetUpChannelIDFieldTrial() {
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_CANARY) {
-    net::SSLConfigService::EnableChannelIDTrial();
-  } else if (channel == chrome::VersionInfo::CHANNEL_DEV &&
-             base::FieldTrialList::IsOneTimeRandomizationEnabled()) {
-    const base::FieldTrial::Probability kDivisor = 100;
-    // 10% probability of being in the enabled group.
-    const base::FieldTrial::Probability kEnableProbability = 10;
-    scoped_refptr<base::FieldTrial> trial =
-        base::FieldTrialList::FactoryGetFieldTrial(
-            "ChannelID", kDivisor, "disable", 2012, 11, 5, NULL);
-    trial->UseOneTimeRandomization();
-    int enable_group = trial->AppendGroup("enable", kEnableProbability);
-    if (trial->group() == enable_group)
-      net::SSLConfigService::EnableChannelIDTrial();
-  }
-}
-
 void ChromeBrowserFieldTrials::SetUpInfiniteCacheFieldTrial() {
   const base::FieldTrial::Probability kDivisor = 100;
 
 #if (defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS))
   const base::FieldTrial::Probability kInfiniteCacheProbability = 0;
 #else
   const base::FieldTrial::Probability kInfiniteCacheProbability = 1;
 #endif
 
   scoped_refptr<base::FieldTrial> trial(
       base::FieldTrialList::FactoryGetFieldTrial("InfiniteCache", kDivisor,
                                                  "No", 2013, 12, 31, NULL));
   trial->UseOneTimeRandomization();
   trial->AppendGroup("Yes", kInfiniteCacheProbability);
   trial->AppendGroup("Control", kInfiniteCacheProbability);
 }