Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1214)

Unified Diff: net/spdy/bidirectional_stream_spdy_impl_unittest.cc

Issue 2156643002: Move ~1000 SpdySerializedFrame instances from heap to stack in tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_proxy_client_socket_pool_unittest.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/bidirectional_stream_spdy_impl_unittest.cc
diff --git a/net/spdy/bidirectional_stream_spdy_impl_unittest.cc b/net/spdy/bidirectional_stream_spdy_impl_unittest.cc
index c4e20e60adcf7a1ade940eee9e204ecb8ce10a57..62394e61c13a01bb60307598c7a0e4591697dcd1 100644
--- a/net/spdy/bidirectional_stream_spdy_impl_unittest.cc
+++ b/net/spdy/bidirectional_stream_spdy_impl_unittest.cc
@@ -255,21 +255,21 @@ class BidirectionalStreamSpdyImplTest : public testing::Test {
};
TEST_F(BidirectionalStreamSpdyImplTest, SendDataAfterStreamFailed) {
- std::unique_ptr<SpdySerializedFrame> req(spdy_util_.ConstructSpdyPost(
+ SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
kDefaultUrl, 1, kBodyDataSize * 3, LOW, nullptr, 0));
- std::unique_ptr<SpdySerializedFrame> rst(
+ SpdySerializedFrame rst(
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_PROTOCOL_ERROR));
MockWrite writes[] = {
- CreateMockWrite(*req, 0), CreateMockWrite(*rst, 2),
+ CreateMockWrite(req, 0), CreateMockWrite(rst, 2),
};
const char* const kExtraHeaders[] = {"X-UpperCase", "yes"};
- std::unique_ptr<SpdySerializedFrame> resp(
+ SpdySerializedFrame resp(
spdy_util_.ConstructSpdyGetSynReply(kExtraHeaders, 1, 1));
MockRead reads[] = {
- CreateMockRead(*resp, 1), MockRead(ASYNC, 0, 3),
+ CreateMockRead(resp, 1), MockRead(ASYNC, 0, 3),
};
InitSession(reads, arraysize(reads), writes, arraysize(writes));
@@ -306,27 +306,25 @@ TEST_F(BidirectionalStreamSpdyImplTest, SendDataAfterStreamFailed) {
}
TEST_F(BidirectionalStreamSpdyImplTest, SendDataAfterCancelStream) {
- BufferedSpdyFramer framer;
-
- std::unique_ptr<SpdySerializedFrame> req(spdy_util_.ConstructSpdyPost(
+ SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
kDefaultUrl, 1, kBodyDataSize * 3, LOWEST, nullptr, 0));
- std::unique_ptr<SpdySerializedFrame> data_frame(
- framer.CreateDataFrame(1, kBodyData, kBodyDataSize, DATA_FLAG_NONE));
- std::unique_ptr<SpdySerializedFrame> rst(
+ 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),
+ CreateMockWrite(req, 0), CreateMockWrite(data_frame, 3),
+ CreateMockWrite(rst, 5),
};
- std::unique_ptr<SpdySerializedFrame> resp(
- spdy_util_.ConstructSpdyGetSynReply(nullptr, 0, 1));
- std::unique_ptr<SpdySerializedFrame> response_body_frame(
- spdy_util_.ConstructSpdyBodyFrame(1, false));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetSynReply(nullptr, 0, 1));
+ SpdySerializedFrame response_body_frame(
+ spdy_util_.ConstructSpdyDataFrame(1, false));
MockRead reads[] = {
- CreateMockRead(*resp, 1),
+ 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),
« no previous file with comments | « net/http/http_proxy_client_socket_pool_unittest.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698