diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/net/http/bidirectional_stream_unittest.cc | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/net/http/bidirectional_stream_unittest.cc')
| -rw-r--r-- | chromium/net/http/bidirectional_stream_unittest.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/net/http/bidirectional_stream_unittest.cc b/chromium/net/http/bidirectional_stream_unittest.cc index 0b54fd1536c..8aedd8e12bf 100644 --- a/chromium/net/http/bidirectional_stream_unittest.cc +++ b/chromium/net/http/bidirectional_stream_unittest.cc @@ -5,7 +5,9 @@ #include "net/http/bidirectional_stream.h" #include <memory> +#include <string> #include <utility> +#include <vector> #include "base/macros.h" #include "base/memory/ptr_util.h" @@ -1212,7 +1214,7 @@ TEST_F(BidirectionalStreamTest, DeleteStreamAfterSendData) { SpdySerializedFrame data_frame(spdy_util_.ConstructSpdyDataFrame( 1, kBodyData, kBodyDataSize, /*fin=*/false)); SpdySerializedFrame rst( - spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); + spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_CANCEL)); MockWrite writes[] = { CreateMockWrite(req, 0), CreateMockWrite(data_frame, 3), @@ -1272,7 +1274,7 @@ TEST_F(BidirectionalStreamTest, DeleteStreamDuringReadData) { SpdySerializedFrame req(spdy_util_.ConstructSpdyPost( kDefaultUrl, 1, kBodyDataSize * 3, LOWEST, nullptr, 0)); SpdySerializedFrame rst( - spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); + spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_CANCEL)); MockWrite writes[] = { CreateMockWrite(req, 0), CreateMockWrite(rst, 4), @@ -1333,7 +1335,7 @@ TEST_F(BidirectionalStreamTest, PropagateProtocolError) { SpdySerializedFrame req(spdy_util_.ConstructSpdyPost( kDefaultUrl, 1, kBodyDataSize * 3, LOW, nullptr, 0)); SpdySerializedFrame rst( - spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_PROTOCOL_ERROR)); + spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_PROTOCOL_ERROR)); MockWrite writes[] = { CreateMockWrite(req, 0), CreateMockWrite(rst, 2), @@ -1400,7 +1402,7 @@ TEST_F(BidirectionalStreamTest, DeleteStreamDuringOnHeadersReceived) { SpdySerializedFrame req(spdy_util_.ConstructSpdyGet(kDefaultUrl, 1, LOWEST)); SpdySerializedFrame rst( - spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); + spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_CANCEL)); MockWrite writes[] = { CreateMockWrite(req, 0), CreateMockWrite(rst, 2), }; @@ -1449,7 +1451,7 @@ TEST_F(BidirectionalStreamTest, DeleteStreamDuringOnDataRead) { SpdySerializedFrame req(spdy_util_.ConstructSpdyGet(kDefaultUrl, 1, LOWEST)); SpdySerializedFrame rst( - spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); + spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_CANCEL)); MockWrite writes[] = { CreateMockWrite(req, 0), CreateMockWrite(rst, 3), }; @@ -1502,7 +1504,7 @@ TEST_F(BidirectionalStreamTest, DeleteStreamDuringOnTrailersReceived) { SpdySerializedFrame req(spdy_util_.ConstructSpdyGet(kDefaultUrl, 1, LOWEST)); SpdySerializedFrame rst( - spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); + spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_CANCEL)); MockWrite writes[] = { CreateMockWrite(req, 0), CreateMockWrite(rst, 4), }; @@ -1560,7 +1562,7 @@ TEST_F(BidirectionalStreamTest, DeleteStreamDuringOnFailed) { SpdySerializedFrame req(spdy_util_.ConstructSpdyGet(kDefaultUrl, 1, LOWEST)); SpdySerializedFrame rst( - spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_PROTOCOL_ERROR)); + spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_PROTOCOL_ERROR)); MockWrite writes[] = { CreateMockWrite(req, 0), CreateMockWrite(rst, 2), |