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 | |
| 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')
| -rw-r--r-- | chrome/browser/prefs/command_line_pref_store.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
3 files changed, 4 insertions, 4 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 }, diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 850611e..12d505c 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -422,8 +422,8 @@ const char kDisableSyncTypedUrls[] = "disable-sync-typed-urls"; // disable translate with the preference. const char kDisableTranslate[] = "disable-translate"; -// Enable TLS Channel ID extension. -const char kEnableTLSChannelID[] = "enable-tls-channel-id"; +// Disables TLS Channel ID extension. +const char kDisableTLSChannelID[] = "disable-tls-channel-id"; // Disables the backend service for web resources. const char kDisableWebResources[] = "disable-web-resources"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 285b913..79036f7 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -122,7 +122,7 @@ extern const char kDisableSyncSearchEngines[]; extern const char kDisableSyncThemes[]; extern const char kDisableSyncTypedUrls[]; extern const char kDisableTranslate[]; -extern const char kEnableTLSChannelID[]; +extern const char kDisableTLSChannelID[]; extern const char kDisableWebResources[]; extern const char kDisableWebsiteSettings[]; extern const char kDisableZeroBrowsersOpenForTests[]; |