Revert "Add field trial for domain bound certificates." The field trial is done.

This reverts commit r133151.

BUG=124105
TEST=none


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

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

4 files changed, 0 insertions, 35 deletions

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 11e8200..1a184ed 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -111,7 +111,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_basic_stream.h"
 #include "net/http/http_network_layer.h"
@@ -1013,25 +1012,6 @@ void ChromeBrowserMainParts::AutoLaunchChromeFieldTrial() {
   }
 }
 
-void ChromeBrowserMainParts::DomainBoundCertsFieldTrial() {
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_CANARY) {
-    net::SSLConfigService::EnableDomainBoundCertsTrial();
-  } 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(
-            "DomainBoundCerts", kDivisor, "disable", 2012, 5, 31, NULL);
-    trial->UseOneTimeRandomization();
-    int enable_group = trial->AppendGroup("enable", kEnableProbability);
-    if (trial->group() == enable_group)
-      net::SSLConfigService::EnableDomainBoundCertsTrial();
-  }
-}
-
 void ChromeBrowserMainParts::SetupUniformityFieldTrials() {
   // One field trial will be created for each entry in this array. The i'th
   // field trial will have |trial_sizes[i]| groups in it, including the default
@@ -1103,7 +1083,6 @@ void ChromeBrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled,
   PredictorFieldTrial();
   DefaultAppsFieldTrial();
   AutoLaunchChromeFieldTrial();
-  DomainBoundCertsFieldTrial();
   gpu_util::InitializeForceCompositingModeFieldTrial();
   SetupUniformityFieldTrials();
   AutocompleteFieldTrial::Activate();
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index d078254..8895b9e 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -129,9 +129,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   // computer startup has on retention and usage of Chrome.
   void AutoLaunchChromeFieldTrial();
 
-  // Field trial for testing domain bound certs.
-  void DomainBoundCertsFieldTrial();
-
   // A collection of field trials intended to test the uniformity and
   // correctness of the field trial control, bucketing and reporting systems.
   void SetupUniformityFieldTrials();
diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc
index 3a79540..d713c11 100644
--- a/net/base/ssl_config_service.cc
+++ b/net/base/ssl_config_service.cc
@@ -74,7 +74,6 @@ SSLConfigService::SSLConfigService()
 }
 
 static bool g_cached_info_enabled = false;
-static bool g_domain_bound_certs_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
@@ -133,11 +132,6 @@ uint16 SSLConfigService::default_version_max() {
   return g_default_version_max;
 }
 
-// static
-void SSLConfigService::EnableDomainBoundCertsTrial() {
-  g_domain_bound_certs_trial = true;
-}
-
 void SSLConfigService::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
@@ -152,8 +146,6 @@ SSLConfigService::~SSLConfigService() {
 // static
 void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
   ssl_config->cached_info_enabled = g_cached_info_enabled;
-  if (g_domain_bound_certs_trial)
-    ssl_config->domain_bound_certs_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 37f66d2..ab0cda6 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 domain bound cert support to be enabled.
-  static void EnableDomainBoundCertsTrial();
-
   // Is SNI available in this configuration?
   static bool IsSNIAvailable(SSLConfigService* service);