summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-04 16:10:30 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-04 16:10:30 +0000
commit5d8e0f506ebbd0f0c80f880488d054d75e7cc844 (patch)
tree67005bd7a253356580bd926281b18a29fb2efb17 /chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
parente5cb7ea6eea635d21f4a080399f22a5afc42ee2a (diff)
downloadchromium_src-5d8e0f506ebbd0f0c80f880488d054d75e7cc844.zip
chromium_src-5d8e0f506ebbd0f0c80f880488d054d75e7cc844.tar.gz
chromium_src-5d8e0f506ebbd0f0c80f880488d054d75e7cc844.tar.bz2
net: don't allow SSLv3 fallback for Google properties.
This change reverts r199185 ("Disable SSL3 fallback restriction on Google properties") and pokes a whole in the HSTS tables to account for crbug.com/237055. BUG=237055 R=palmer@chromium.org, rsleevi@chromium.org, wtc@chromium.org Review URL: https://codereview.chromium.org/23523016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/ssl_config_service_manager_pref_unittest.cc')
-rw-r--r--chrome/browser/net/ssl_config_service_manager_pref_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
index f2a9338..7a09c81 100644
--- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
+++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
@@ -161,8 +161,6 @@ TEST_F(SSLConfigServiceManagerPrefTest, BadDisabledCipherSuites) {
// SSL 3.0 ~ default_version_max() are enabled;
// * without --enable-unrestricted-ssl3-fallback,
// |unrestricted_ssl3_fallback_enabled| is false.
-// TODO(thaidn): |unrestricted_ssl3_fallback_enabled| is true by default
-// temporarily until we have fixed deployment issues.
TEST_F(SSLConfigServiceManagerPrefTest, NoCommandLinePrefs) {
scoped_refptr<TestingPrefStore> local_state_store(new TestingPrefStore());
@@ -186,7 +184,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, NoCommandLinePrefs) {
EXPECT_EQ(net::SSL_PROTOCOL_VERSION_SSL3, ssl_config.version_min);
EXPECT_EQ(net::SSLConfigService::default_version_max(),
ssl_config.version_max);
- EXPECT_TRUE(ssl_config.unrestricted_ssl3_fallback_enabled);
+ EXPECT_FALSE(ssl_config.unrestricted_ssl3_fallback_enabled);
// The settings should not be added to the local_state.
EXPECT_FALSE(local_state->HasPrefPath(prefs::kSSLVersionMin));