| Index: chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/net/ssl_config_service_manager_pref_unittest.cc (revision 258624)
|
| +++ chrome/browser/net/ssl_config_service_manager_pref_unittest.cc (working copy)
|
| @@ -146,11 +146,8 @@
|
| EXPECT_EQ(0x0005, config.disabled_cipher_suites[1]);
|
| }
|
|
|
| -// Test that
|
| -// * without command-line settings for minimum and maximum SSL versions,
|
| -// SSL 3.0 ~ default_version_max() are enabled;
|
| -// * without --enable-unrestricted-ssl3-fallback,
|
| -// |unrestricted_ssl3_fallback_enabled| is false.
|
| +// Test that without command-line settings for minimum and maximum SSL versions,
|
| +// SSL 3.0 ~ default_version_max() are enabled.
|
| TEST_F(SSLConfigServiceManagerPrefTest, NoCommandLinePrefs) {
|
| scoped_refptr<TestingPrefStore> local_state_store(new TestingPrefStore());
|
|
|
| @@ -174,13 +171,10 @@
|
| EXPECT_EQ(net::SSL_PROTOCOL_VERSION_SSL3, ssl_config.version_min);
|
| EXPECT_EQ(net::SSLConfigService::default_version_max(),
|
| ssl_config.version_max);
|
| - 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));
|
| EXPECT_FALSE(local_state->HasPrefPath(prefs::kSSLVersionMax));
|
| - EXPECT_FALSE(local_state->HasPrefPath(
|
| - prefs::kEnableUnrestrictedSSL3Fallback));
|
|
|
| // Explicitly double-check the settings are not in the preference store.
|
| std::string version_min_str;
|
| @@ -189,10 +183,6 @@
|
| &version_min_str));
|
| EXPECT_FALSE(local_state_store->GetString(prefs::kSSLVersionMax,
|
| &version_max_str));
|
| - bool unrestricted_ssl3_fallback_enabled;
|
| - EXPECT_FALSE(local_state_store->GetBoolean(
|
| - prefs::kEnableUnrestrictedSSL3Fallback,
|
| - &unrestricted_ssl3_fallback_enabled));
|
| }
|
|
|
| // Test that command-line settings for minimum and maximum SSL versions are
|
| @@ -203,7 +193,6 @@
|
| CommandLine command_line(CommandLine::NO_PROGRAM);
|
| command_line.AppendSwitchASCII(switches::kSSLVersionMin, "tls1");
|
| command_line.AppendSwitchASCII(switches::kSSLVersionMax, "ssl3");
|
| - command_line.AppendSwitch(switches::kEnableUnrestrictedSSL3Fallback);
|
|
|
| PrefServiceMockFactory factory;
|
| factory.set_user_prefs(local_state_store);
|
| @@ -224,7 +213,6 @@
|
| // Command-line flags should be respected.
|
| EXPECT_EQ(net::SSL_PROTOCOL_VERSION_TLS1, ssl_config.version_min);
|
| EXPECT_EQ(net::SSL_PROTOCOL_VERSION_SSL3, ssl_config.version_max);
|
| - EXPECT_TRUE(ssl_config.unrestricted_ssl3_fallback_enabled);
|
|
|
| // Explicitly double-check the settings are not in the preference store.
|
| const PrefService::Preference* version_min_pref =
|
| @@ -235,10 +223,6 @@
|
| local_state->FindPreference(prefs::kSSLVersionMax);
|
| EXPECT_FALSE(version_max_pref->IsUserModifiable());
|
|
|
| - const PrefService::Preference* ssl3_fallback_pref =
|
| - local_state->FindPreference(prefs::kEnableUnrestrictedSSL3Fallback);
|
| - EXPECT_FALSE(ssl3_fallback_pref->IsUserModifiable());
|
| -
|
| std::string version_min_str;
|
| std::string version_max_str;
|
| EXPECT_FALSE(local_state_store->GetString(prefs::kSSLVersionMin,
|
| @@ -245,8 +229,4 @@
|
| &version_min_str));
|
| EXPECT_FALSE(local_state_store->GetString(prefs::kSSLVersionMax,
|
| &version_max_str));
|
| - bool unrestricted_ssl3_fallback_enabled;
|
| - EXPECT_FALSE(local_state_store->GetBoolean(
|
| - prefs::kEnableUnrestrictedSSL3Fallback,
|
| - &unrestricted_ssl3_fallback_enabled));
|
| }
|
|
|