Revert 216444 "net: add a test to ensure that our TLS handshake ..."

This is failing on Android bots.

> net: add a test to ensure that our TLS handshake doesn't get too large.
> 
> (I would like the test to assert that we have some headroom too, but we don't
> have any to assert!)
> 
> BUG=none
> R=rsleevi@chromium.org, wtc@chromium.org
> 
> Review URL: https://codereview.chromium.org/19557004

TBR=agl@chromium.org

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

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

2 files changed, 0 insertions, 57 deletions

diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 0c43699..77a3142 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -274,7 +274,6 @@ class TestPageHandler(testserver_base.BasePageHandler):
       self.ClientRedirectHandler,
       self.MultipartHandler,
       self.GetSSLSessionCacheHandler,
-      self.GetSSLClientHelloSizeHandler,
       self.SSLManySmallRecords,
       self.GetChannelID,
       self.CloseSocketHandler,
@@ -1390,20 +1389,6 @@ class TestPageHandler(testserver_base.BasePageHandler):
                        ' this request')
     return True
 
-  def GetSSLClientHelloSizeHandler(self):
-    """Send a reply containing the length of the ClientHello record."""
-
-    if not self._ShouldHandleRequest('/client-hello-length'):
-      return False
-
-    self.send_response(200)
-    self.send_header('Content-Type', 'text/plain')
-    self.end_headers()
-
-    self.wfile.write('%d' % self.server.tlsConnection.client_hello_length)
-
-    return True
-
   def SSLManySmallRecords(self):
     """Sends a reply consisting of a variety of small writes. These will be
     translated into a series of small SSL records when used over an HTTPS
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 0ce397e..64f5ac1 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -5405,48 +5405,6 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) {
   }
 }
 
-// Check that our ClientHello doesn't get too large because that's known to
-// cause issues.
-TEST_F(HTTPSRequestTest, ClientHelloTest) {
-  SpawnedTestServer::SSLOptions ssl_options;
-  SpawnedTestServer test_server(
-      SpawnedTestServer::TYPE_HTTPS,
-      ssl_options,
-      base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
-  ASSERT_TRUE(test_server.Start());
-
-  // NPN/ALPN strings need to be enabled in order for the size of the handshake
-  // to be accurate as ALPN includes these strings in the handshake. This will
-  // be reset by NetTestSuite.
-  HttpStreamFactory::EnableNpnSpdy4a2();
-
-  TestDelegate d;
-  URLRequest r(
-      test_server.GetURL("client-hello-length"), &d, &default_context_);
-
-  r.Start();
-  EXPECT_TRUE(r.is_pending());
-
-  base::MessageLoop::current()->Run();
-
-  // The response will be a single, base 10 number which is the number of bytes
-  // in the ClientHello, including the handshake message type byte and 3 byte
-  // length at the beginning.
-
-  EXPECT_EQ(1, d.response_started_count());
-  unsigned client_hello_length;
-  ASSERT_TRUE(base::StringToUint(d.data_received(), &client_hello_length));
-  // We add the overhead of an SNI extension because the request is sent to
-  // 127.0.0.1 and so doesn't have one otherwise.
-  const unsigned sni_overhead = 2 /* extension type */ +
-                                2 /* extension length */ +
-                                4 /* lengths in the server_name extension */ +
-                                strlen("www.wellsfargo.com");
-  static const unsigned session_id_overhead = 32;
-
-  EXPECT_GT(256u, client_hello_length + sni_overhead + session_id_overhead);
-}
-
 class TestSSLConfigService : public SSLConfigService {
  public:
   TestSSLConfigService(bool ev_enabled,