Do not send default port number in WebSocket over HTTP/2 request.

Also add some unrelated test expectations.

Bug: 825231
Change-Id: I04c26e6ddd7ab2ad340ab8dd6f333d5589547a73
Reviewed-on: https://chromium-review.googlesource.com/979092Reviewed-by: Adam Rice <ricea@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545960}

net/spdy/chromium/spdy_http_utils.cc

@@ -114,7 +114,7 @@ void CreateSpdyHeadersFromHttpRequestForWebSocket(
     const HttpRequestHeaders& request_headers,
     SpdyHeaderBlock* headers) {
   (*headers)[kHttp2MethodHeader] = "CONNECT";
-  (*headers)[kHttp2AuthorityHeader] = GetHostAndPort(url);
+  (*headers)[kHttp2AuthorityHeader] = GetHostAndOptionalPort(url);
   (*headers)[kHttp2SchemeHeader] = "https";
   (*headers)[kHttp2PathHeader] = url.PathForRequest();
   (*headers)[kHttp2ProtocolHeader] = "websocket";

net/spdy/chromium/spdy_network_transaction_unittest.cc

@@ -7124,7 +7124,7 @@ TEST_F(SpdyNetworkTransactionTest, WebSocketOverHTTP2) {
 
   SpdyHeaderBlock websocket_request_headers;
   websocket_request_headers[kHttp2MethodHeader] = "CONNECT";
-  websocket_request_headers[kHttp2AuthorityHeader] = "www.example.org:443";
+  websocket_request_headers[kHttp2AuthorityHeader] = "www.example.org";
   websocket_request_headers[kHttp2SchemeHeader] = "https";
   websocket_request_headers[kHttp2PathHeader] = "/";
   websocket_request_headers[kHttp2ProtocolHeader] = "websocket";

net/websockets/websocket_handshake_stream_create_helper_test.cc

@@ -186,7 +186,7 @@ class WebSocketHandshakeStreamCreateHelperTest
       case HTTP2_HANDSHAKE_STREAM: {
         SpdyTestUtil spdy_util;
         SpdyHeaderBlock request_header_block = WebSocketHttp2Request(
-            kPath, "www.example.org:443", kOrigin, extra_request_headers);
+            kPath, "www.example.org", kOrigin, extra_request_headers);
         SpdySerializedFrame request_headers(spdy_util.ConstructSpdyHeaders(
             1, std::move(request_header_block), DEFAULT_PRIORITY, false));
         MockWrite writes[] = {CreateMockWrite(request_headers, 0)};

net/websockets/websocket_stream_test.cc

@@ -220,7 +220,7 @@ class WebSocketStreamCreateTest : public TestWithParam<HandshakeStreamType>,
 
     // WebSocket request.
     SpdyHeaderBlock request_headers =
-        WebSocketHttp2Request(socket_path, "www.example.org:443",
+        WebSocketHttp2Request(socket_path, "www.example.org",
                               "http://www.example.org", extra_request_headers);
     frames_.push_back(spdy_util_.ConstructSpdyHeaders(
         3, std::move(request_headers), DEFAULT_PRIORITY, false));
@@ -1567,6 +1567,10 @@ TEST_P(WebSocketMultiProtocolStreamCreateTest, Http2StreamReset) {
     base::RunLoop().RunUntilIdle();
     stream_request_.reset();
 
+    EXPECT_TRUE(has_failed());
+    EXPECT_EQ("Stream closed with error: net::ERR_SPDY_PROTOCOL_ERROR",
+              failure_message());
+
     auto samples = histogram_tester.GetHistogramSamplesSinceCreation(
         "Net.WebSocket.HandshakeResult2");
     EXPECT_EQ(1, samples->TotalCount());