Remove status_code and status_text from WebSocketHandshakeResponseInfo

They are contained in net::HttpResponseHeaders which is also contained
in the struct.

Bug: 721400
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I11b438790fc351ba9097bb44415c5c5c4ca923c3
Reviewed-on: https://chromium-review.googlesource.com/1071327
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Adam Rice <ricea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561436}

net/websockets/websocket_channel_test.cc

@@ -1573,9 +1573,10 @@ TEST_F(WebSocketChannelEventInterfaceTest, FinishHandshakeRequest) {
 
   CreateChannelAndConnectSuccessfully();
 
-  auto response_headers = base::MakeRefCounted<HttpResponseHeaders>("");
+  auto response_headers =
+      base::MakeRefCounted<HttpResponseHeaders>("HTTP/1.1 200 OK");
   auto response_info = std::make_unique<WebSocketHandshakeResponseInfo>(
-      GURL("ws://www.example.com/"), 200, "OK", response_headers, base::Time());
+      GURL("ws://www.example.com/"), response_headers, base::Time());
   connect_data_.argument_saver.connect_delegate->OnFinishOpeningHandshake(
       std::move(response_info));
   base::RunLoop().RunUntilIdle();
@@ -1596,9 +1597,10 @@ TEST_F(WebSocketChannelEventInterfaceTest, FailJustAfterHandshake) {
   GURL url("ws://www.example.com/");
   auto request_info =
       std::make_unique<WebSocketHandshakeRequestInfo>(url, base::Time());
-  auto response_headers = base::MakeRefCounted<HttpResponseHeaders>("");
+  auto response_headers =
+      base::MakeRefCounted<HttpResponseHeaders>("HTTP/1.1 200 OK");
   auto response_info = std::make_unique<WebSocketHandshakeResponseInfo>(
-      url, 200, "OK", response_headers, base::Time());
+      url, response_headers, base::Time());
   connect_delegate->OnStartOpeningHandshake(std::move(request_info));
   connect_delegate->OnFinishOpeningHandshake(std::move(response_info));
 

net/websockets/websocket_handshake_response_info.cc

@@ -14,15 +14,9 @@ namespace net {
 
 WebSocketHandshakeResponseInfo::WebSocketHandshakeResponseInfo(
     const GURL& url,
-    int status_code,
-    const std::string& status_text,
     scoped_refptr<HttpResponseHeaders> headers,
     base::Time response_time)
-    : url(url),
-      status_code(status_code),
-      status_text(status_text),
-      headers(headers),
-      response_time(response_time) {}
+    : url(url), headers(std::move(headers)), response_time(response_time) {}
 
 WebSocketHandshakeResponseInfo::~WebSocketHandshakeResponseInfo() = default;
 

net/websockets/websocket_handshake_response_info.h

@@ -5,8 +5,6 @@
 #ifndef NET_WEBSOCKETS_WEBSOCKET_HANDSHAKE_RESPONSE_INFO_H_
 #define NET_WEBSOCKETS_WEBSOCKET_HANDSHAKE_RESPONSE_INFO_H_
 
-#include <string>
-
 #include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/time/time.h"
@@ -19,17 +17,11 @@ class HttpResponseHeaders;
 
 struct NET_EXPORT WebSocketHandshakeResponseInfo {
   WebSocketHandshakeResponseInfo(const GURL& url,
-                                 int status_code,
-                                 const std::string& status_text,
                                  scoped_refptr<HttpResponseHeaders> headers,
                                  base::Time response_time);
   ~WebSocketHandshakeResponseInfo();
   // The request URL
   GURL url;
-  // HTTP status code
-  int status_code;
-  // HTTP status text
-  std::string status_text;
   // HTTP response headers
   scoped_refptr<HttpResponseHeaders> headers;
   // The time that this response arrived

net/websockets/websocket_stream.cc

@@ -467,9 +467,8 @@ void WebSocketDispatchOnFinishOpeningHandshake(
   DCHECK(connect_delegate);
   if (headers.get()) {
     connect_delegate->OnFinishOpeningHandshake(
-        std::make_unique<WebSocketHandshakeResponseInfo>(
-            url, headers->response_code(), headers->GetStatusText(), headers,
-            response_time));
+        std::make_unique<WebSocketHandshakeResponseInfo>(url, headers,
+                                                         response_time));
   }
 }
 

net/websockets/websocket_stream_test.cc

@@ -609,8 +609,8 @@ TEST_P(WebSocketStreamCreateTest, HandshakeInfo) {
   // mainly only in this test case.
   EXPECT_EQ(GURL("ws://www.example.org/"), request_info_->url);
   EXPECT_EQ(GURL("ws://www.example.org/"), response_info_->url);
-  EXPECT_EQ(101, response_info_->status_code);
-  EXPECT_EQ("Switching Protocols", response_info_->status_text);
+  EXPECT_EQ(101, response_info_->headers->response_code());
+  EXPECT_EQ("Switching Protocols", response_info_->headers->GetStatusText());
   ASSERT_EQ(12u, request_headers.size());
   EXPECT_EQ(HeaderKeyValuePair("Host", "www.example.org"), request_headers[0]);
   EXPECT_EQ(HeaderKeyValuePair("Connection", "Upgrade"), request_headers[1]);
@@ -1459,7 +1459,7 @@ TEST_P(WebSocketStreamCreateBasicAuthTest, SuccessPasswordInUrl) {
   EXPECT_FALSE(has_failed());
   EXPECT_TRUE(stream_);
   ASSERT_TRUE(response_info_);
-  EXPECT_EQ(101, response_info_->status_code);
+  EXPECT_EQ(101, response_info_->headers->response_code());
 }
 
 TEST_P(WebSocketStreamCreateBasicAuthTest, FailureIncorrectPasswordInUrl) {
@@ -1486,7 +1486,7 @@ TEST_P(WebSocketStreamCreateDigestAuthTest, DigestPasswordInUrl) {
   EXPECT_FALSE(has_failed());
   EXPECT_TRUE(stream_);
   ASSERT_TRUE(response_info_);
-  EXPECT_EQ(101, response_info_->status_code);
+  EXPECT_EQ(101, response_info_->headers->response_code());
 }
 
 TEST_P(WebSocketMultiProtocolStreamCreateTest, Incomplete) {

services/network/websocket.cc

@@ -236,8 +236,8 @@ void WebSocket::WebSocketEventHandler::OnFinishOpeningHandshake(
   mojom::WebSocketHandshakeResponsePtr response_to_pass(
       mojom::WebSocketHandshakeResponse::New());
   response_to_pass->url.Swap(&response->url);
-  response_to_pass->status_code = response->status_code;
-  response_to_pass->status_text = response->status_text;
+  response_to_pass->status_code = response->headers->response_code();
+  response_to_pass->status_text = response->headers->GetStatusText();
   size_t iter = 0;
   std::string name, value;
   while (response->headers->EnumerateHeaderLines(&iter, &name, &value)) {