s/SYN_STREAM/HEADERS/ in frame types, method names, comments.

net/http/bidirectional_stream_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/bidirectional_stream.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 415 matching lines @@
   // Empty DATA frame with an END_STREAM flag.
   SpdySerializedFrame end_stream(
       spdy_util_.ConstructSpdyDataFrame(1, nullptr, 0, true));
   MockWrite writes[] = {
       CreateMockWrite(req, 0),
   };
 
   const char* const kExtraResponseHeaders[] = {"header-name", "header-value"};
 
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraResponseHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraResponseHeaders, 1, 1));
 
   SpdySerializedFrame body_frame(spdy_util_.ConstructSpdyDataFrame(1, false));
   // Last body frame has END_STREAM flag set.
   SpdySerializedFrame last_body_frame(
       spdy_util_.ConstructSpdyDataFrame(1, true));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       MockRead(ASYNC, ERR_IO_PENDING, 2),  // Force a pause.
       CreateMockRead(body_frame, 3),
@@ skipping 61 matching lines @@
 // Tests that the NetLog contains correct entries.
 TEST_F(BidirectionalStreamTest, TestNetLogContainEntries) {
   SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
       kDefaultUrl, 1, kBodyDataSize * 3, LOWEST, nullptr, 0));
   SpdySerializedFrame data_frame(spdy_util_.ConstructSpdyDataFrame(
       1, kBodyData, kBodyDataSize, /*fin=*/true));
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(data_frame, 3),
   };
 
-  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetSynReply(nullptr, 0, 1));
+  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   SpdySerializedFrame response_body_frame1(
       spdy_util_.ConstructSpdyDataFrame(1, false));
   SpdySerializedFrame response_body_frame2(
       spdy_util_.ConstructSpdyDataFrame(1, false));
 
   SpdyHeaderBlock trailers;
   trailers["foo"] = "bar";
   SpdySerializedFrame response_trailers(
       spdy_util_.ConstructSpdyResponseHeaders(1, std::move(trailers), true));
 
@@ skipping 124 matching lines @@
       1, kBodyData, kBodyDataSize, /*fin=*/false));
   SpdySerializedFrame data_frame2(spdy_util_.ConstructSpdyDataFrame(
       1, kBodyData, kBodyDataSize, /*fin=*/false));
   SpdySerializedFrame data_frame3(spdy_util_.ConstructSpdyDataFrame(
       1, kBodyData, kBodyDataSize, /*fin=*/true));
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(data_frame1, 3),
       CreateMockWrite(data_frame2, 6), CreateMockWrite(data_frame3, 9),
   };
 
-  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetSynReply(nullptr, 0, 1));
+  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   SpdySerializedFrame response_body_frame1(
       spdy_util_.ConstructSpdyDataFrame(1, false));
   SpdySerializedFrame response_body_frame2(
       spdy_util_.ConstructSpdyDataFrame(1, true));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       MockRead(ASYNC, ERR_IO_PENDING, 2),  // Force a pause.
       CreateMockRead(response_body_frame1, 4),
       MockRead(ASYNC, ERR_IO_PENDING, 5),  // Force a pause.
@@ skipping 76 matching lines @@
 TEST_F(BidirectionalStreamTest, TestCoalesceSmallDataBuffers) {
   SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
       kDefaultUrl, 1, kBodyDataSize * 1, LOWEST, nullptr, 0));
   std::string body_data = "some really long piece of data";
   SpdySerializedFrame data_frame1(spdy_util_.ConstructSpdyDataFrame(
       1, body_data.c_str(), body_data.size(), /*fin=*/true));
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(data_frame1, 1),
   };
 
-  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetSynReply(nullptr, 0, 1));
+  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   SpdySerializedFrame response_body_frame1(
       spdy_util_.ConstructSpdyDataFrame(1, true));
   MockRead reads[] = {
       CreateMockRead(resp, 2),
       MockRead(ASYNC, ERR_IO_PENDING, 3),  // Force a pause.
       CreateMockRead(response_body_frame1, 4), MockRead(ASYNC, 0, 5),
   };
 
   InitSession(reads, arraysize(reads), writes, arraysize(writes));
 
@@ skipping 80 matching lines @@
 // Tests that BidirectionalStreamSpdyImpl::OnClose will complete any remaining
 // read even if the read queue is empty.
 TEST_F(BidirectionalStreamTest, TestCompleteAsyncRead) {
   SpdySerializedFrame req(spdy_util_.ConstructSpdyGet(kDefaultUrl, 1, LOWEST));
   // Empty DATA frame with an END_STREAM flag.
   SpdySerializedFrame end_stream(
       spdy_util_.ConstructSpdyDataFrame(1, nullptr, 0, true));
 
   MockWrite writes[] = {CreateMockWrite(req, 0)};
 
-  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetSynReply(nullptr, 0, 1));
+  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
 
   SpdySerializedFrame response_body_frame(
       spdy_util_.ConstructSpdyDataFrame(1, nullptr, 0, true));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       MockRead(ASYNC, ERR_IO_PENDING, 2),  // Force a pause.
       CreateMockRead(response_body_frame, 3), MockRead(SYNCHRONOUS, 0, 4),
   };
 
@@ skipping 39 matching lines @@
   SpdySerializedFrame req(spdy_util_.ConstructSpdyGet(kDefaultUrl, 1, LOWEST));
   // Empty DATA frame with an END_STREAM flag.
   SpdySerializedFrame end_stream(
       spdy_util_.ConstructSpdyDataFrame(1, nullptr, 0, true));
 
   MockWrite writes[] = {CreateMockWrite(req, 0)};
 
   const char* const kExtraResponseHeaders[] = {"header-name", "header-value"};
 
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraResponseHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraResponseHeaders, 1, 1));
 
   SpdySerializedFrame body_frame(spdy_util_.ConstructSpdyDataFrame(1, false));
   // Last body frame has END_STREAM flag set.
   SpdySerializedFrame last_body_frame(
       spdy_util_.ConstructSpdyDataFrame(1, true));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       CreateMockRead(body_frame, 2),
       CreateMockRead(body_frame, 3),
@@ skipping 60 matching lines @@
   SpdySerializedFrame end_stream(
       spdy_util_.ConstructSpdyDataFrame(1, nullptr, 0, true));
 
   MockWrite writes[] = {
       CreateMockWrite(req, 0),
   };
 
   const char* const kExtraResponseHeaders[] = {"header-name", "header-value"};
 
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraResponseHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraResponseHeaders, 1, 1));
 
   SpdySerializedFrame body_frame(spdy_util_.ConstructSpdyDataFrame(1, false));
 
   SpdyHeaderBlock trailers;
   trailers["foo"] = "bar";
   SpdySerializedFrame response_trailers(
       spdy_util_.ConstructSpdyResponseHeaders(1, std::move(trailers), true));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1),
@@ skipping 57 matching lines @@
   SpdySerializedFrame data_frame(spdy_util_.ConstructSpdyDataFrame(
       1, kBodyData, kBodyDataSize, /*fin=*/false));
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL));
 
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(data_frame, 3),
       CreateMockWrite(rst, 5),
   };
 
-  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetSynReply(nullptr, 0, 1));
+  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   SpdySerializedFrame response_body_frame(
       spdy_util_.ConstructSpdyDataFrame(1, false));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       MockRead(ASYNC, ERR_IO_PENDING, 2),  // Force a pause.
       MockRead(ASYNC, ERR_IO_PENDING, 4),  // Force a pause.
       MockRead(ASYNC, 0, 6),
   };
 
@@ skipping 40 matching lines @@
 TEST_F(BidirectionalStreamTest, CancelStreamDuringReadData) {
   SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
       kDefaultUrl, 1, kBodyDataSize * 3, LOWEST, nullptr, 0));
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL));
 
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(rst, 4),
   };
 
-  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetSynReply(nullptr, 0, 1));
+  SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   SpdySerializedFrame response_body_frame(
       spdy_util_.ConstructSpdyDataFrame(1, false));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       MockRead(ASYNC, ERR_IO_PENDING, 2),  // Force a pause.
       CreateMockRead(response_body_frame, 3), MockRead(ASYNC, 0, 5),
   };
 
   InitSession(reads, arraysize(reads), writes, arraysize(writes));
@@ skipping 38 matching lines @@
       kDefaultUrl, 1, kBodyDataSize * 3, LOW, nullptr, 0));
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_PROTOCOL_ERROR));
 
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(rst, 2),
   };
 
   const char* const kExtraHeaders[] = {"X-UpperCase", "yes"};
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraHeaders, 1, 1));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1), MockRead(ASYNC, 0, 3),
   };
 
   InitSession(reads, arraysize(reads), writes, arraysize(writes));
 
   std::unique_ptr<BidirectionalStreamRequestInfo> request_info(
       new BidirectionalStreamRequestInfo);
   request_info->method = "POST";
@@ skipping 49 matching lines @@
 
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL));
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(rst, 2),
   };
 
   const char* const kExtraResponseHeaders[] = {"header-name", "header-value"};
 
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraResponseHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraResponseHeaders, 1, 1));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1), MockRead(ASYNC, 0, 3),
   };
 
   InitSession(reads, arraysize(reads), writes, arraysize(writes));
 
   std::unique_ptr<BidirectionalStreamRequestInfo> request_info(
       new BidirectionalStreamRequestInfo);
   request_info->method = "GET";
@@ skipping 31 matching lines @@
 
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL));
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(rst, 3),
   };
 
   const char* const kExtraResponseHeaders[] = {"header-name", "header-value"};
 
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraResponseHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraResponseHeaders, 1, 1));
 
   SpdySerializedFrame response_body_frame(
       spdy_util_.ConstructSpdyDataFrame(1, false));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1), CreateMockRead(response_body_frame, 2),
       MockRead(ASYNC, 0, 4),
   };
 
   InitSession(reads, arraysize(reads), writes, arraysize(writes));
@@ skipping 34 matching lines @@
 
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL));
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(rst, 4),
   };
 
   const char* const kExtraResponseHeaders[] = {"header-name", "header-value"};
 
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraResponseHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraResponseHeaders, 1, 1));
 
   SpdySerializedFrame response_body_frame(
       spdy_util_.ConstructSpdyDataFrame(1, false));
 
   SpdyHeaderBlock trailers;
   trailers["foo"] = "bar";
   SpdySerializedFrame response_trailers(
       spdy_util_.ConstructSpdyResponseHeaders(1, std::move(trailers), true));
 
   MockRead reads[] = {
@@ skipping 41 matching lines @@
 
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_PROTOCOL_ERROR));
 
   MockWrite writes[] = {
       CreateMockWrite(req, 0), CreateMockWrite(rst, 2),
   };
 
   const char* const kExtraHeaders[] = {"X-UpperCase", "yes"};
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraHeaders, 1, 1));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1), MockRead(ASYNC, 0, 3),
   };
 
   InitSession(reads, arraysize(reads), writes, arraysize(writes));
 
   std::unique_ptr<BidirectionalStreamRequestInfo> request_info(
       new BidirectionalStreamRequestInfo);
   request_info->method = "GET";
@@ skipping 31 matching lines @@
       spdy_util_.ConstructSpdyDataFrame(1, nullptr, 0, true));
 
   MockWrite writes[] = {CreateMockWrite(req, 0)};
 
   std::string alt_svc_header_value = AlternateProtocolToString(QUIC);
   alt_svc_header_value.append("=\"www.example.org:443\"");
   const char* const kExtraResponseHeaders[] = {"alt-svc",
                                                alt_svc_header_value.c_str()};
 
   SpdySerializedFrame resp(
-      spdy_util_.ConstructSpdyGetSynReply(kExtraResponseHeaders, 1, 1));
+      spdy_util_.ConstructSpdyGetReply(kExtraResponseHeaders, 1, 1));
   SpdySerializedFrame body_frame(spdy_util_.ConstructSpdyDataFrame(1, true));
 
   MockRead reads[] = {
       CreateMockRead(resp, 1), CreateMockRead(body_frame, 2),
       MockRead(SYNCHRONOUS, 0, 3),
   };
 
   // Enable QUIC so that the alternative service header can be added to
   // HttpServerProperties.
   session_deps_.enable_quic = true;
@@ skipping 28 matching lines @@
       http_session_->http_server_properties()->GetAlternativeServices(
           url::SchemeHostPort(default_url_));
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(AlternateProtocolFromNextProto(kProtoQUIC1SPDY3),
             alternative_service_vector[0].protocol);
   EXPECT_EQ("www.example.org", alternative_service_vector[0].host);
   EXPECT_EQ(443, alternative_service_vector[0].port);
 }
 
 }  // namespace net