Revert "TLS channel id field trial."

This reverts commit 145978.

BUG=136462,142388
TBR=rch@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10826284

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151347 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 35 deletions

diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index 7099830..9aae20a 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -124,7 +124,6 @@ void ChromeBrowserFieldTrials::SetupFieldTrials(bool proxy_policy_is_set) {
   SetupUniformityFieldTrials();
   AutocompleteFieldTrial::Activate();
   DisableNewTabFieldTrialIfNecesssary();
-  ChannelIDFieldTrial();
 }
 
 // This is an A/B test for the maximum number of persistent connections per
@@ -583,22 +582,3 @@ void ChromeBrowserFieldTrials::DisableNewTabFieldTrialIfNecesssary() {
       trial->Disable();
   }
 }
-
-void ChromeBrowserFieldTrials::ChannelIDFieldTrial() {
-  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, 8, 23, NULL);
-    trial->UseOneTimeRandomization();
-    int enable_group = trial->AppendGroup("enable", kEnableProbability);
-    if (trial->group() == enable_group)
-      net::SSLConfigService::EnableChannelIDTrial();
-  }
-}
diff --git a/chrome/browser/chrome_browser_field_trials.h b/chrome/browser/chrome_browser_field_trials.h
index 7655574..7f3d692 100644
--- a/chrome/browser/chrome_browser_field_trials.h
+++ b/chrome/browser/chrome_browser_field_trials.h
@@ -62,9 +62,6 @@ class ChromeBrowserFieldTrials {
   // Disables the new tab field trial if not running in desktop mode.
   void DisableNewTabFieldTrialIfNecesssary();
 
-  // Field trial for testing TLS channel id.
-  void ChannelIDFieldTrial();
-
   const CommandLine& parsed_command_line_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserFieldTrials);
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 1b7b49f..422b2e5 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -108,7 +108,6 @@
 #include "grit/platform_locale_settings.h"
 #include "net/base/net_module.h"
 #include "net/base/sdch_manager.h"
-#include "net/base/ssl_config_service.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_stream_factory.h"
 #include "net/spdy/spdy_session.h"
diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc
index 94fa84c..2dbee56 100644
--- a/net/base/ssl_config_service.cc
+++ b/net/base/ssl_config_service.cc
@@ -65,7 +65,6 @@ SSLConfigService::SSLConfigService()
 }
 
 static bool g_cached_info_enabled = false;
-static bool g_channel_id_trial = false;
 
 // GlobalCRLSet holds a reference to the global CRLSet. It simply wraps a lock
 // around a scoped_refptr so that getting a reference doesn't race with
@@ -124,11 +123,6 @@ uint16 SSLConfigService::default_version_max() {
   return g_default_version_max;
 }
 
-// static
-void SSLConfigService::EnableChannelIDTrial() {
-  g_channel_id_trial = true;
-}
-
 void SSLConfigService::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
@@ -143,8 +137,6 @@ SSLConfigService::~SSLConfigService() {
 // static
 void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
   ssl_config->cached_info_enabled = g_cached_info_enabled;
-  if (g_channel_id_trial)
-    ssl_config->channel_id_enabled = true;
 }
 
 void SSLConfigService::ProcessConfigUpdate(const SSLConfig& orig_config,
diff --git a/net/base/ssl_config_service.h b/net/base/ssl_config_service.h
index 4ad882b..de430e1 100644
--- a/net/base/ssl_config_service.h
+++ b/net/base/ssl_config_service.h
@@ -180,9 +180,6 @@ class NET_EXPORT SSLConfigService
   static void SetDefaultVersionMax(uint16 version_max);
   static uint16 default_version_max();
 
-  // Force channel ID support to be enabled.
-  static void EnableChannelIDTrial();
-
   // Is SNI available in this configuration?
   static bool IsSNIAvailable(SSLConfigService* service);