diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 21:37:18 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 21:37:18 +0000 |
commit | b48ae27390d24b5658595e7732406c76255774ac (patch) | |
tree | fbe2013258652836ec8ab1486bc7514594bcb185 /chrome/browser/prefs/command_line_pref_store.cc | |
parent | 6eb874c920561b5409c2585569fe4a396fb1c951 (diff) | |
download | chromium_src-b48ae27390d24b5658595e7732406c76255774ac.zip chromium_src-b48ae27390d24b5658595e7732406c76255774ac.tar.gz chromium_src-b48ae27390d24b5658595e7732406c76255774ac.tar.bz2 |
Revert 158894 - Disable TLS channel ID by default. (for merging to branch)
BUG=129174
TEST=browse to https://www.google.com, check chrome://histograms for DomainBoundCerts.Support. Then try with --enable-tls-channel-id flag.
Review URL: https://codereview.chromium.org/10979040
TBR=mattm@chromium.org
Review URL: https://codereview.chromium.org/10981045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/command_line_pref_store.cc')
-rw-r--r-- | chrome/browser/prefs/command_line_pref_store.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index d774ce9..df49ea2 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -49,7 +49,7 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry prefs::kWebKitAllowDisplayingInsecureContent, false }, { switches::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, true }, - { switches::kEnableTLSChannelID, prefs::kEnableOriginBoundCerts, true }, + { switches::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false }, { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting, true }, { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true }, |