TLS channel id field trial.

TLS channel id field trial.

BUG=136462
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=145978

[mattm, 2012-07-10 03:24:13]

Did we want to do just the canary at first or the same canary + 10% dev?  I did
the canary + dev here..

[ivan_cobs.com.sg, 2012-07-10 03:49:07]

Pls remove the following email adds from your list NOW

ivan@cobs.com.sg
lynn@cobs.com.sg

-----Original Message-----
From: mattm@chromium.org [mailto:mattm@chromium.org] 
Sent: Tuesday, 10 July, 2012 11:24 AM
To: rch@chromium.org
Cc: chromium-reviews@chromium.org; cbentzel+watch@chromium.org;
darin-cc@chromium.org; balfanz@google.com
Subject: [chromium-reviews] TLS channel id field trial. (issue 10753022)

Reviewers: Ryan Hamilton,

Message:
Did we want to do just the canary at first or the same canary + 10% dev?  I
did the canary + dev here..

Description:
TLS channel id field trial.

BUG=136462


Please review this at http://codereview.chromium.org/10753022/

SVN Base: svn://svn.chromium.org/chrome/trunk/src

Affected files:
   M chrome/browser/chrome_browser_main.h
   M chrome/browser/chrome_browser_main.cc
   M net/base/ssl_config_service.h
   M net/base/ssl_config_service.cc


Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc
b/chrome/browser/chrome_browser_main.cc
index
4a279f3fef89db9349eeb1cc452ef56fcc5debcf..64548b08834bf226c4190e4fed0250f58e
7f8223
100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -115,6 +115,7 @@
  #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"
@@ -1099,6 +1100,25 @@ void
ChromeBrowserMainParts::DisableNewTabFieldTrialIfNecesssary() {
    }
  }

+void ChromeBrowserMainParts::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();
+  }
+}
+
  // ChromeBrowserMainParts: |SetupMetricsAndFieldTrials()| related
--------------

  void ChromeBrowserMainParts::SetupFieldTrials(bool proxy_policy_is_set) {
@@ -1121,6 +1141,7 @@ void ChromeBrowserMainParts::SetupFieldTrials(bool
proxy_policy_is_set) {
    SetupUniformityFieldTrials();
    AutocompleteFieldTrial::Activate();
    DisableNewTabFieldTrialIfNecesssary();
+  ChannelIDFieldTrial();
  }

  void ChromeBrowserMainParts::StartMetricsRecording() {
Index: chrome/browser/chrome_browser_main.h
diff --git a/chrome/browser/chrome_browser_main.h
b/chrome/browser/chrome_browser_main.h
index
347e7f860df2a36d52b0796ce349b77c54045a90..e957a53a36595886bb30759f9383e79d9c
13043e
100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -140,6 +140,9 @@ class ChromeBrowserMainParts : public
content::BrowserMainParts {
    // Disables the new tab field trial if not running in desktop mode.
    void DisableNewTabFieldTrialIfNecesssary();

+  // Field trial for testing TLS channel id.
+  void ChannelIDFieldTrial();
+
    // Methods for |SetupMetricsAndFieldTrials()|
--------------------------------

    // Constructs metrics service and does related initialization, including
Index: net/base/ssl_config_service.cc
diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc
index
ad2928e16172f262aba580eb4449f02b1b5dd880..f9ee9ef8baa6cf9c968b67837864ef4fb1
e565fa
100644
--- a/net/base/ssl_config_service.cc
+++ b/net/base/ssl_config_service.cc
@@ -74,6 +74,7 @@ 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 @@
-132,6 +133,11 @@ 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);
  }
@@ -146,6 +152,8 @@ 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,
Index: net/base/ssl_config_service.h
diff --git a/net/base/ssl_config_service.h b/net/base/ssl_config_service.h
index
b4ba45ab937a7448a01cd5d721b1ce680674362f..94c5efc8b6858de70f90dae0e6fbcf6a92
b51fa6
100644
--- a/net/base/ssl_config_service.h
+++ b/net/base/ssl_config_service.h
@@ -181,6 +181,9 @@ 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);

[Ryan Hamilton, 2012-07-10 15:35:27]

On 2012/07/10 03:24:13, mattm wrote:
> Did we want to do just the canary at first or the same canary + 10% dev?  I
did
> the canary + dev here..

lgtm.  I think we said just canary, but canary + dev is also fine.

[commit-bot: I haz the power, 2012-07-10 19:40:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mattm@chromium.org/10753022/1

[commit-bot: I haz the power, 2012-07-10 21:32:41]

Try job failure for 10753022-1 (retry) on win for step "compile" (clobber
build).
It's a second try, previously, step "compile" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win&number...

[commit-bot: I haz the power, 2012-07-10 21:34:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mattm@chromium.org/10753022/1

[commit-bot: I haz the power, 2012-07-10 23:00:36]

Change committed as 145978