diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-15 00:23:07 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-15 00:23:07 +0000 |
| commit | f6c02375c9a589f5415b9f9869d70b83528bc73d (patch) | |
| tree | 2763106b466b16d994197b18745da6c13201f9d3 /chrome/browser/prefs | |
| parent | ff56572b431626b608de7df634cddf179ae38cc3 (diff) | |
| download | chromium_src-f6c02375c9a589f5415b9f9869d70b83528bc73d.zip chromium_src-f6c02375c9a589f5415b9f9869d70b83528bc73d.tar.gz chromium_src-f6c02375c9a589f5415b9f9869d70b83528bc73d.tar.bz2 | |
Enable TLS channeld id by default.
Replace --enable-origin-bound-certs command line flag with
--disable-tls-channel-id.
Remove field trial.
BUG=136462,129174
Review URL: https://chromiumcodereview.appspot.com/10910240
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/command_line_pref_store.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index a3ce691..df49ea2 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -49,8 +49,7 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry prefs::kWebKitAllowDisplayingInsecureContent, false }, { switches::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, true }, - { switches::kEnableOriginBoundCerts, prefs::kEnableOriginBoundCerts, - true }, + { switches::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false }, { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting, true }, { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true }, |