summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-24 05:54:45 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-24 05:54:45 +0000
commit8b9211d4e1de4531f7b462625a0a5ceec1d4dcce (patch)
tree603c0452ed127784359493a1cd3dbe0ee68c32a2 /net
parentec4b64129526581d67d252c5eae9d65130d85f39 (diff)
downloadchromium_src-8b9211d4e1de4531f7b462625a0a5ceec1d4dcce.zip
chromium_src-8b9211d4e1de4531f7b462625a0a5ceec1d4dcce.tar.gz
chromium_src-8b9211d4e1de4531f7b462625a0a5ceec1d4dcce.tar.bz2
[SPDY] Remove ConstructSpdyPush() overload that doesn't take a URL
It was used in two places; one place, it was used correctly so I inlined it. In the other place, I replaced it with a call to the ConstructSpdyPush() overload that takes a URL. BUG= Review URL: https://chromiumcodereview.appspot.com/16972013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/spdy/spdy_network_transaction_unittest.cc18
-rw-r--r--net/spdy/spdy_test_util_common.cc21
-rw-r--r--net/spdy/spdy_test_util_common.h4
-rw-r--r--net/spdy/spdy_test_util_spdy2.cc9
-rw-r--r--net/spdy/spdy_test_util_spdy2.h4
-rw-r--r--net/spdy/spdy_test_util_spdy3.cc9
-rw-r--r--net/spdy/spdy_test_util_spdy3.h4
7 files changed, 15 insertions, 54 deletions
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index d7de25b..c8813e2 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -3329,7 +3329,8 @@ TEST_P(SpdyNetworkTransactionTest, UpperCaseHeadersOnPush) {
reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));
const char* const extra_headers[] = {"X-UpperCase", "yes"};
scoped_ptr<SpdyFrame>
- push(spdy_util_.ConstructSpdyPush(extra_headers, 1, 2, 1));
+ push(spdy_util_.ConstructSpdyPush(
+ extra_headers, 1, 2, 1, "http://www.google.com"));
scoped_ptr<SpdyFrame> body(spdy_util_.ConstructSpdyBodyFrame(1, true));
MockRead reads[] = {
CreateMockRead(*reply, 1),
@@ -4015,8 +4016,19 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushNoURL) {
scoped_ptr<SpdyFrame>
stream1_reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));
- scoped_ptr<SpdyFrame>
- stream2_syn(spdy_util_.ConstructSpdyPush(NULL, 0, 2, 1));
+ scoped_ptr<SpdyHeaderBlock> incomplete_headers(new SpdyHeaderBlock());
+ (*incomplete_headers)["hello"] = "bye";
+ (*incomplete_headers)[spdy_util_.GetStatusKey()] = "200 OK";
+ (*incomplete_headers)[spdy_util_.GetVersionKey()] = "HTTP/1.1";
+ scoped_ptr<SpdyFrame> stream2_syn(
+ spdy_util_.ConstructSpdyControlFrame(incomplete_headers.Pass(),
+ false,
+ 2, // Stream ID
+ LOWEST,
+ SYN_STREAM,
+ CONTROL_FLAG_NONE,
+ // Associated stream ID
+ 1));
MockRead reads[] = {
CreateMockRead(*stream1_reply, 2),
CreateMockRead(*stream2_syn, 3),
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index 0fa5b32..43ee5de 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -798,27 +798,6 @@ SpdyFrame* SpdyTestUtil::ConstructSpdyConnect(
SpdyFrame* SpdyTestUtil::ConstructSpdyPush(const char* const extra_headers[],
int extra_header_count,
int stream_id,
- int associated_stream_id) {
- const char* const kStandardGetHeaders[] = {
- "hello", "bye",
- GetStatusKey(), "200",
- GetVersionKey(), "HTTP/1.1"
- };
- return ConstructSpdyControlFrame(extra_headers,
- extra_header_count,
- false,
- stream_id,
- LOWEST,
- SYN_STREAM,
- CONTROL_FLAG_NONE,
- kStandardGetHeaders,
- arraysize(kStandardGetHeaders),
- associated_stream_id);
-}
-
-SpdyFrame* SpdyTestUtil::ConstructSpdyPush(const char* const extra_headers[],
- int extra_header_count,
- int stream_id,
int associated_stream_id,
const char* url) {
scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock());
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
index 308cd1b..8aacf57 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h
@@ -390,10 +390,6 @@ class SpdyTestUtil {
SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
int extra_header_count,
int stream_id,
- int associated_stream_id);
- SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
- int extra_header_count,
- int stream_id,
int associated_stream_id,
const char* url);
SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
diff --git a/net/spdy/spdy_test_util_spdy2.cc b/net/spdy/spdy_test_util_spdy2.cc
index bc5c85b..166c23f 100644
--- a/net/spdy/spdy_test_util_spdy2.cc
+++ b/net/spdy/spdy_test_util_spdy2.cc
@@ -24,15 +24,6 @@ namespace test_spdy2 {
SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
int extra_header_count,
int stream_id,
- int associated_stream_id) {
- SpdyTestUtil util(kProtoSPDY2);
- return util.ConstructSpdyPush(extra_headers, extra_header_count,
- stream_id, associated_stream_id);
-}
-
-SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
- int extra_header_count,
- int stream_id,
int associated_stream_id,
const char* url) {
SpdyTestUtil util(kProtoSPDY2);
diff --git a/net/spdy/spdy_test_util_spdy2.h b/net/spdy/spdy_test_util_spdy2.h
index 900cf06..7a5124a 100644
--- a/net/spdy/spdy_test_util_spdy2.h
+++ b/net/spdy/spdy_test_util_spdy2.h
@@ -31,10 +31,6 @@ namespace test_spdy2 {
SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
int extra_header_count,
int stream_id,
- int associated_stream_id);
-SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
- int extra_header_count,
- int stream_id,
int associated_stream_id,
const char* url);
SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
diff --git a/net/spdy/spdy_test_util_spdy3.cc b/net/spdy/spdy_test_util_spdy3.cc
index 898a4f6..1a90a5c 100644
--- a/net/spdy/spdy_test_util_spdy3.cc
+++ b/net/spdy/spdy_test_util_spdy3.cc
@@ -23,15 +23,6 @@ namespace test_spdy3 {
SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
int extra_header_count,
int stream_id,
- int associated_stream_id) {
- SpdyTestUtil util(kProtoSPDY3);
- return util.ConstructSpdyPush(extra_headers, extra_header_count,
- stream_id, associated_stream_id);
-}
-
-SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
- int extra_header_count,
- int stream_id,
int associated_stream_id,
const char* url) {
SpdyTestUtil util(kProtoSPDY3);
diff --git a/net/spdy/spdy_test_util_spdy3.h b/net/spdy/spdy_test_util_spdy3.h
index 466b1af..eee54dc 100644
--- a/net/spdy/spdy_test_util_spdy3.h
+++ b/net/spdy/spdy_test_util_spdy3.h
@@ -35,10 +35,6 @@ namespace test_spdy3 {
SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
int extra_header_count,
int stream_id,
- int associated_stream_id);
-SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
- int extra_header_count,
- int stream_id,
int associated_stream_id,
const char* url);
SpdyFrame* ConstructSpdyPush(const char* const extra_headers[],
generated by cgit v1.1 at 2025-03-27 12:06:02 +0000