Revert: "net: don't allow SSLv3 fallback for Google properties."

net/http/http_network_transaction_ssl_unittest.cc

Index: net/http/http_network_transaction_ssl_unittest.cc
diff --git a/net/http/http_network_transaction_ssl_unittest.cc b/net/http/http_network_transaction_ssl_unittest.cc
index e16173eb2ed2efb51feff4e709b6ef08bb1e3476..bb218498961bed3fb00df5c06392b9c9208754fc 100644
--- a/net/http/http_network_transaction_ssl_unittest.cc
+++ b/net/http/http_network_transaction_ssl_unittest.cc
@@ -132,6 +132,9 @@ TEST_F(HttpNetworkTransactionSSLTest, SSL3FallbackDisabled_Google) {
   scoped_ptr<HttpNetworkTransaction> trans(
       new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
 
+  SSLConfig& ssl_config = GetServerSSLConfig(trans.get());
+  ssl_config.unrestricted_ssl3_fallback_enabled = false;
+
   TestCompletionCallback callback;
   // This will consume only |ssl_data1|. |ssl_data2| will not be consumed.
   int rv = callback.GetResult(
@@ -144,7 +147,6 @@ TEST_F(HttpNetworkTransactionSSLTest, SSL3FallbackDisabled_Google) {
   // Confirms that only |ssl_data1| is consumed.
   EXPECT_EQ(1u, mock_data.next_index());
 
-  SSLConfig& ssl_config = GetServerSSLConfig(trans.get());
   // |version_max| never fallbacks to SSLv3 for Google properties.
   EXPECT_EQ(SSL_PROTOCOL_VERSION_TLS1, ssl_config.version_max);
   EXPECT_FALSE(ssl_config.version_fallback);
@@ -223,6 +225,9 @@ TEST_F(HttpNetworkTransactionSSLTest, SSL3FallbackDisabled_Paypal) {
   scoped_ptr<HttpNetworkTransaction> trans(
       new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
 
+  SSLConfig& ssl_config = GetServerSSLConfig(trans.get());
+  ssl_config.unrestricted_ssl3_fallback_enabled = false;
+
   TestCompletionCallback callback;
   // This will consume |ssl_data1| and |ssl_data2|.
   int rv = callback.GetResult(
@@ -235,7 +240,6 @@ TEST_F(HttpNetworkTransactionSSLTest, SSL3FallbackDisabled_Paypal) {
   // Confirms that both |ssl_data1| and |ssl_data2| are consumed.
   EXPECT_EQ(2u, mock_data.next_index());
 
-  SSLConfig& ssl_config = GetServerSSLConfig(trans.get());
   // |version_max| fallbacks to SSL 3.0.
   EXPECT_EQ(SSL_PROTOCOL_VERSION_SSL3, ssl_config.version_max);
   EXPECT_TRUE(ssl_config.version_fallback);
@@ -274,6 +278,9 @@ TEST_F(HttpNetworkTransactionSSLTest, SSLFallback) {
   scoped_ptr<HttpNetworkTransaction> trans(
       new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
 
+  SSLConfig& ssl_config = GetServerSSLConfig(trans.get());
+  ssl_config.unrestricted_ssl3_fallback_enabled = true;
+
   TestCompletionCallback callback;
   // This will consume |ssl_data1|, |ssl_data2| and |ssl_data3|.
   int rv = callback.GetResult(
@@ -286,7 +293,6 @@ TEST_F(HttpNetworkTransactionSSLTest, SSLFallback) {
   // Confirms that |ssl_data1|, |ssl_data2| and |ssl_data3| are consumed.
   EXPECT_EQ(3u, mock_data.next_index());
 
-  SSLConfig& ssl_config = GetServerSSLConfig(trans.get());
   // |version_max| fallbacks to SSL 3.0.
   EXPECT_EQ(SSL_PROTOCOL_VERSION_SSL3, ssl_config.version_max);
   EXPECT_TRUE(ssl_config.version_fallback);