diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 21:30:02 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 21:30:02 +0000 |
| commit | 6eb874c920561b5409c2585569fe4a396fb1c951 (patch) | |
| tree | b388860eb0da77861a968324e95ed9803f8dbf56 | |
| parent | 1a0af4046fa9f6440f426598f653e1bb0035a7f2 (diff) | |
| download | chromium_src-6eb874c920561b5409c2585569fe4a396fb1c951.zip chromium_src-6eb874c920561b5409c2585569fe4a396fb1c951.tar.gz chromium_src-6eb874c920561b5409c2585569fe4a396fb1c951.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158894 0039d316-1c4b-4281-b951-d872f2087c98
| -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 | ||||
| -rw-r--r-- | net/base/ssl_config_service.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index df49ea2..d774ce9 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::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false }, + { switches::kEnableTLSChannelID, prefs::kEnableOriginBoundCerts, true }, { 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 12d505c..850611e 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"; -// Disables TLS Channel ID extension. -const char kDisableTLSChannelID[] = "disable-tls-channel-id"; +// Enable TLS Channel ID extension. +const char kEnableTLSChannelID[] = "enable-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 79036f7..285b913 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 kDisableTLSChannelID[]; +extern const char kEnableTLSChannelID[]; extern const char kDisableWebResources[]; extern const char kDisableWebsiteSettings[]; extern const char kDisableZeroBrowsersOpenForTests[]; diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc index f7c18aa..ad2928e16 100644 --- a/net/base/ssl_config_service.cc +++ b/net/base/ssl_config_service.cc @@ -38,7 +38,7 @@ SSLConfig::SSLConfig() version_min(g_default_version_min), version_max(g_default_version_max), cached_info_enabled(false), - channel_id_enabled(true), + channel_id_enabled(false), false_start_enabled(true), send_client_cert(false), verify_ev_cert(false), |