diff options
author | mlloyd@chromium.org <mlloyd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 19:57:28 +0000 |
---|---|---|
committer | mlloyd@chromium.org <mlloyd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 19:57:28 +0000 |
commit | a4aeaf46531bf14c25b93c0ded418c220bf222cb (patch) | |
tree | 649f07eb1196c0e93e518a276e89e9a10af92c18 /net/http | |
parent | e211b3b42e93288b60bc5c1c9d27a616edf84bb7 (diff) | |
download | chromium_src-a4aeaf46531bf14c25b93c0ded418c220bf222cb.zip chromium_src-a4aeaf46531bf14c25b93c0ded418c220bf222cb.tar.gz chromium_src-a4aeaf46531bf14c25b93c0ded418c220bf222cb.tar.bz2 |
More SPDY unit test refactoring and cleanup: removed hex frames from spdy_test_util.h
BUG=None
TEST=net_unittests pass
Review URL: http://codereview.chromium.org/2861038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r-- | net/http/http_network_transaction_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index e0a679b..498ded3 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -5154,10 +5154,10 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) { MockWrite spdy_writes[] = { CreateMockWrite(req.get()) }; scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0)); + scoped_ptr<spdy::SpdyFrame> data(ConstructSpdyBodyFrame()); MockRead spdy_reads[] = { CreateMockRead(resp.get()), - MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame), - arraysize(kGetBodyFrame)), + CreateMockRead(data.get()), MockRead(true, 0, 0), }; @@ -5290,11 +5290,11 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) { const char kCONNECTResponse[] = "HTTP/1.1 200 Connected\r\n\r\n"; scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0)); + scoped_ptr<spdy::SpdyFrame> data(ConstructSpdyBodyFrame()); MockRead spdy_reads[] = { MockRead(true, kCONNECTResponse, arraysize(kCONNECTResponse) - 1, 1), // 1 CreateMockRead(resp.get(), 4), // 2, 4 - MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame), // 5 - arraysize(kGetBodyFrame), 4), + CreateMockRead(data.get(), 4), // 5 MockRead(true, 0, 0, 4), // 6 }; @@ -5384,10 +5384,10 @@ TEST_F(HttpNetworkTransactionTest, MockWrite spdy_writes[] = { CreateMockWrite(req.get()) }; scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0)); + scoped_ptr<spdy::SpdyFrame> data(ConstructSpdyBodyFrame()); MockRead spdy_reads[] = { CreateMockRead(resp.get()), - MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame), - arraysize(kGetBodyFrame)), + CreateMockRead(data.get()), MockRead(true, 0, 0), }; |