Revert "Revert 207759 "Disable TLS 1.2 if USE_OPENSSL is defined (such a..."" (r208102).

seems to be causing Android failures in content_tests: http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20Tests%20%28dbg%29&number=12049

BUG=
TBR=wtc@chromium.org

Review URL: https://codereview.chromium.org/17444018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208107 0039d316-1c4b-4281-b951-d872f2087c98

net/ssl/ssl_config_service.cc

@@ -20,9 +20,9 @@ static uint16 g_default_version_min = SSL_PROTOCOL_VERSION_SSL3;
 
 static uint16 g_default_version_max =
 #if defined(USE_OPENSSL)
-#if defined(SSL_OP_NO_TLSv1_2)
-    SSL_PROTOCOL_VERSION_TLS1_2;
-#elif defined(SSL_OP_NO_TLSv1_1)
+// TODO(wtc): do not enable TLS 1.2 until we can keep ClientHello under 256
+// bytes. See http://crbug.com/245500 and http://crbug.com/247691.
+#if defined(SSL_OP_NO_TLSv1_1)
     SSL_PROTOCOL_VERSION_TLS1_1;
 #else
     SSL_PROTOCOL_VERSION_TLS1;