Index: net/http/http_network_transaction_spdy3_unittest.cc |
diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc |
index bfe8f6b71b64988668e53479261e459ac03dfd01..60a4af2b5863a1ce9bed6b2aa526ca1ef0c1fa92 100644 |
--- a/net/http/http_network_transaction_spdy3_unittest.cc |
+++ b/net/http/http_network_transaction_spdy3_unittest.cc |
@@ -2795,7 +2795,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectHttps) { |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session)); |
// CONNECT to www.google.com:443 via SPDY |
- scoped_ptr<SpdyFrame> connect(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> connect(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
// fetch https://www.google.com/ via HTTP |
const char get[] = "GET / HTTP/1.1\r\n" |
@@ -2880,7 +2880,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectSpdy) { |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session)); |
// CONNECT to www.google.com:443 via SPDY |
- scoped_ptr<SpdyFrame> connect(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> connect(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
// fetch https://www.google.com/ via SPDY |
const char* const kMyUrl = "https://www.google.com/"; |
scoped_ptr<SpdyFrame> get( |
@@ -2964,7 +2964,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectFailure) { |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session)); |
// CONNECT to www.google.com:443 via SPDY |
- scoped_ptr<SpdyFrame> connect(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> connect(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
scoped_ptr<SpdyFrame> get( |
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); |
@@ -3026,7 +3026,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, |
request2.load_flags = 0; |
// CONNECT to www.google.com:443 via SPDY. |
- scoped_ptr<SpdyFrame> connect1(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> connect1(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
scoped_ptr<SpdyFrame> conn_resp1(ConstructSpdyGetSynReply(NULL, 0, 1)); |
// Fetch https://www.google.com/ via HTTP. |
@@ -3181,7 +3181,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, |
request2.load_flags = 0; |
// CONNECT to www.google.com:443 via SPDY. |
- scoped_ptr<SpdyFrame> connect1(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> connect1(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
scoped_ptr<SpdyFrame> conn_resp1(ConstructSpdyGetSynReply(NULL, 0, 1)); |
// Fetch https://www.google.com/ via HTTP. |
@@ -5655,7 +5655,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, RedirectOfHttpsConnectViaSpdyProxy) { |
request.url = GURL("https://www.google.com/"); |
request.load_flags = 0; |
- scoped_ptr<SpdyFrame> conn(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> conn(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
scoped_ptr<SpdyFrame> goaway( |
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); |
MockWrite data_writes[] = { |
@@ -5762,7 +5762,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, |
request.url = GURL("https://www.google.com/"); |
request.load_flags = 0; |
- scoped_ptr<SpdyFrame> conn(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> conn(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
scoped_ptr<SpdyFrame> rst( |
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); |
MockWrite data_writes[] = { |
@@ -5827,7 +5827,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) { |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
// Since we have proxy, should try to establish tunnel. |
- scoped_ptr<SpdyFrame> req(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
scoped_ptr<SpdyFrame> rst( |
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL)); |
@@ -5836,8 +5836,8 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) { |
const char* const kAuthCredentials[] = { |
"proxy-authorization", "Basic Zm9vOmJhcg==", |
}; |
- scoped_ptr<SpdyFrame> connect2( |
- ConstructSpdyConnect(kAuthCredentials, arraysize(kAuthCredentials)/2, 3)); |
+ scoped_ptr<SpdyFrame> connect2(spdy_util_.ConstructSpdyConnect( |
+ kAuthCredentials, arraysize(kAuthCredentials) / 2, 3)); |
// fetch https://www.google.com/ via HTTP |
const char get[] = "GET / HTTP/1.1\r\n" |
"Host: www.google.com\r\n" |
@@ -10806,7 +10806,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, DoNotUseSpdySessionForHttpOverTunnel) { |
const std::string httpUrl = "http://www.google.com:443/"; |
// SPDY GET for HTTPS URL (through CONNECT tunnel) |
- scoped_ptr<SpdyFrame> connect(ConstructSpdyConnect(NULL, 0, 1)); |
+ scoped_ptr<SpdyFrame> connect(spdy_util_.ConstructSpdyConnect(NULL, 0, 1)); |
scoped_ptr<SpdyFrame> req1( |
spdy_util_.ConstructSpdyGet(https_url.c_str(), false, 1, LOWEST)); |