net: disable SSLv3.

net/url_request/url_request_unittest.cc

Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index d900069d7fc0a9896894c5767e51d5f080fb49f6..3c7fc79e26cae097fb805aba79a6f78c22b9866a 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -7080,6 +7080,10 @@ class TestSSLConfigService : public SSLConfigService {
             rev_checking_required_local_anchors),
         fallback_min_version_(0) {}
 
+  void set_min_version(uint16 version) {
+    min_version_ = version;
+  }
+
   void set_fallback_min_version(uint16 version) {
     fallback_min_version_ = version;
   }
@@ -7094,6 +7098,9 @@ class TestSSLConfigService : public SSLConfigService {
     if (fallback_min_version_) {
       config->version_fallback_min = fallback_min_version_;
     }
+    if (min_version_) {
+      config->version_min = min_version_;
+    }
   }
 
  protected:
@@ -7103,6 +7110,7 @@ class TestSSLConfigService : public SSLConfigService {
   const bool ev_enabled_;
   const bool online_rev_checking_;
   const bool rev_checking_required_local_anchors_;
+  uint16 min_version_;
   uint16 fallback_min_version_;
 };
 
@@ -7117,6 +7125,7 @@ class FallbackTestURLRequestContext : public TestURLRequestContext {
                                  false /* online revocation checking */,
                                  false /* require rev. checking for local
                                           anchors */);
+    ssl_config_service->set_min_version(SSL_PROTOCOL_VERSION_SSL3);
     ssl_config_service->set_fallback_min_version(version);
     set_ssl_config_service(ssl_config_service);
   }
@@ -7252,7 +7261,7 @@ TEST_F(HTTPSFallbackTest, SSLv3Fallback) {
       SpawnedTestServer::SSLOptions::TLS_INTOLERANT_ALL;
 
   ASSERT_NO_FATAL_FAILURE(DoFallbackTest(ssl_options));
-  ExpectFailure(ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION);
+  ExpectFailure(ERR_SSL_VERSION_OR_CIPHER_MISMATCH);
 }
 
 // Tests that the SSLv3 fallback works when explicitly enabled.
@@ -7307,6 +7316,7 @@ TEST_F(HTTPSRequestTest, SSLv3FallbackNoCache) {
     TestDelegate delegate;
     FallbackTestURLRequestContext context(true);
 
+    context.set_fallback_min_version(SSL_PROTOCOL_VERSION_TLS1);

[davidben, 2014/10/29 00:32:05]

To make sure I'm not missing something, this is just to be explicit about it,
right? I.e. the test still passes with the current defaults.

[agl, 2014/10/29 01:01:18]

This triggers a TestSSLConfigService which sets the minimum version to be SSLv3.

[davidben, 2014/10/29 19:19:33]

Acknowledged.

     context.Init();
     scoped_ptr<URLRequest> request(context.CreateRequest(
         test_server.GetURL(std::string()), DEFAULT_PRIORITY, &delegate, NULL));