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

With r208081 (https://codereview.chromium.org/16879015), it is safe to
re-enable TLS 1.2 for USE_OPENSSL.

> Disable TLS 1.2 if USE_OPENSSL is defined (such as on Android) to
> prevent ClientHello from being larger than 256 bytes. Some broken
> servers can't handle a large ClientHello.
> 
> R=agl@chromium.org,rsleevi@chromium.org
> BUG=90392,245500,247691
> TEST=none
> 
> Review URL: https://chromiumcodereview.appspot.com/17094016

TBR=wtc@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208102 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)
-// 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)
+#if defined(SSL_OP_NO_TLSv1_2)
+    SSL_PROTOCOL_VERSION_TLS1_2;
+#elif defined(SSL_OP_NO_TLSv1_1)
     SSL_PROTOCOL_VERSION_TLS1_1;
 #else
     SSL_PROTOCOL_VERSION_TLS1;