Index: net/spdy/spdy_session_unittest.cc |
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc |
index 2f185c7c01a09c6c7828f5acf526f8d8b4384365..827fc8b603303c4ab139bde0110de048d98f35f2 100644 |
--- a/net/spdy/spdy_session_unittest.cc |
+++ b/net/spdy/spdy_session_unittest.cc |
@@ -238,9 +238,6 @@ TEST_P(SpdySessionTest, PendingStreamCancellingAnother) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
akalin
2014/01/29 23:26:18
nice cleanup!
|
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -298,9 +295,6 @@ TEST_P(SpdySessionTest, GoAwayWithNoActiveStreams) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -332,9 +326,6 @@ TEST_P(SpdySessionTest, GoAwayImmediatelyWithNoActiveStreams) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
data.StopAfter(1); |
@@ -369,9 +360,6 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreams) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -379,7 +367,7 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreams) { |
EXPECT_EQ(spdy_util_.spdy_version(), session->GetProtocolVersion()); |
- GURL url("http://www.google.com"); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url, MEDIUM, BoundNetLog()); |
@@ -453,9 +441,6 @@ TEST_P(SpdySessionTest, GoAwayTwice) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -463,7 +448,7 @@ TEST_P(SpdySessionTest, GoAwayTwice) { |
EXPECT_EQ(spdy_util_.spdy_version(), session->GetProtocolVersion()); |
- GURL url("http://www.google.com"); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url, MEDIUM, BoundNetLog()); |
@@ -535,9 +520,6 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreamsThenClose) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -545,7 +527,7 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreamsThenClose) { |
EXPECT_EQ(spdy_util_.spdy_version(), session->GetProtocolVersion()); |
- GURL url("http://www.google.com"); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url, MEDIUM, BoundNetLog()); |
@@ -594,7 +576,6 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreamsThenClose) { |
// Try to create a stream after receiving a GOAWAY frame. It should |
// fail. |
TEST_P(SpdySessionTest, CreateStreamAfterGoAway) { |
- const char kStreamUrl[] = "http://www.google.com"; |
session_deps_.host_resolver->set_synchronous_mode(true); |
MockConnect connect_data(SYNCHRONOUS, OK); |
@@ -613,9 +594,6 @@ TEST_P(SpdySessionTest, CreateStreamAfterGoAway) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -623,7 +601,7 @@ TEST_P(SpdySessionTest, CreateStreamAfterGoAway) { |
EXPECT_EQ(spdy_util_.spdy_version(), session->GetProtocolVersion()); |
- GURL url(kStreamUrl); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url, MEDIUM, BoundNetLog()); |
@@ -662,13 +640,12 @@ TEST_P(SpdySessionTest, CreateStreamAfterGoAway) { |
// Receiving a SYN_STREAM frame after a GOAWAY frame should result in |
// the stream being refused. |
TEST_P(SpdySessionTest, SynStreamAfterGoAway) { |
- const char kStreamUrl[] = "http://www.google.com"; |
session_deps_.host_resolver->set_synchronous_mode(true); |
MockConnect connect_data(SYNCHRONOUS, OK); |
scoped_ptr<SpdyFrame> goaway(spdy_util_.ConstructSpdyGoAway(1)); |
scoped_ptr<SpdyFrame> |
- push(spdy_util_.ConstructSpdyPush(NULL, 0, 2, 1, kStreamUrl)); |
+ push(spdy_util_.ConstructSpdyPush(NULL, 0, 2, 1, kDefaultURL)); |
MockRead reads[] = { |
CreateMockRead(*goaway, 1), |
CreateMockRead(*push, 2), |
@@ -687,9 +664,6 @@ TEST_P(SpdySessionTest, SynStreamAfterGoAway) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -697,7 +671,7 @@ TEST_P(SpdySessionTest, SynStreamAfterGoAway) { |
EXPECT_EQ(spdy_util_.spdy_version(), session->GetProtocolVersion()); |
- GURL url(kStreamUrl); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url, MEDIUM, BoundNetLog()); |
@@ -728,6 +702,73 @@ TEST_P(SpdySessionTest, SynStreamAfterGoAway) { |
EXPECT_TRUE(session == NULL); |
} |
+// A session observing a network change with active streams should close |
+// when the last active stream is closed. |
+TEST_P(SpdySessionTest, NetworkChangeWithActiveStreams) { |
+ session_deps_.host_resolver->set_synchronous_mode(true); |
+ |
+ MockConnect connect_data(SYNCHRONOUS, OK); |
+ MockRead reads[] = { |
+ MockRead(ASYNC, 0, 1) // EOF |
+ }; |
+ scoped_ptr<SpdyFrame> req1( |
+ spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, MEDIUM, true)); |
+ MockWrite writes[] = { |
+ CreateMockWrite(*req1, 0), |
+ }; |
+ DeterministicSocketData data(reads, arraysize(reads), |
+ writes, arraysize(writes)); |
+ data.set_connect_data(connect_data); |
+ session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
+ |
+ CreateDeterministicNetworkSession(); |
+ |
+ base::WeakPtr<SpdySession> session = |
+ CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
+ |
+ EXPECT_EQ(spdy_util_.spdy_version(), session->GetProtocolVersion()); |
+ |
+ base::WeakPtr<SpdyStream> spdy_stream = |
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, session, |
+ GURL(kDefaultURL), MEDIUM, BoundNetLog()); |
+ test::StreamDelegateDoNothing delegate(spdy_stream); |
+ spdy_stream->SetDelegate(&delegate); |
+ |
+ scoped_ptr<SpdyHeaderBlock> headers( |
+ spdy_util_.ConstructGetHeaderBlock(kDefaultURL)); |
+ |
+ spdy_stream->SendRequestHeaders(headers.Pass(), NO_MORE_DATA_TO_SEND); |
+ EXPECT_TRUE(spdy_stream->HasUrlFromHeaders()); |
+ |
+ data.RunFor(1); |
+ |
+ EXPECT_EQ(1u, spdy_stream->stream_id()); |
+ |
+ EXPECT_TRUE(HasSpdySession(spdy_session_pool_, key_)); |
+ |
+ spdy_session_pool_->OnIPAddressChanged(); |
+ |
+ // The SpdySessionPool behavior differs based on how the OSs reacts to |
+ // network changes, see comment in SpdySessionPool::OnIPAddressChanged(). |
akalin
2014/01/29 23:26:18
change , to ;
|
+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_IOS) |
+ // For OSs where the TCP connections will close upon relevant network |
+ // changes, SpdySessionPool doesn't need to force them to close, so in these |
+ // cases verify the session has become unavailable but remains open and the |
+ // pre-existing stream is still active. |
+ EXPECT_FALSE(HasSpdySession(spdy_session_pool_, key_)); |
+ |
+ EXPECT_FALSE(session->IsClosed()); |
+ |
+ EXPECT_TRUE(session->IsStreamActive(1)); |
+ |
+ // Should close the session. |
+ spdy_stream->Close(); |
+#endif |
+ EXPECT_EQ(NULL, spdy_stream.get()); |
+ |
+ EXPECT_TRUE(session == NULL); |
+} |
+ |
TEST_P(SpdySessionTest, ClientPing) { |
session_deps_.enable_ping = true; |
session_deps_.host_resolver->set_synchronous_mode(true); |
@@ -747,9 +788,6 @@ TEST_P(SpdySessionTest, ClientPing) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -805,9 +843,6 @@ TEST_P(SpdySessionTest, ServerPing) { |
data.set_connect_data(connect_data); |
session_deps_.socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -857,15 +892,12 @@ TEST_P(SpdySessionTest, PingAndWriteLoop) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url("http://www.google.com"); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url, LOWEST, BoundNetLog()); |
@@ -887,8 +919,6 @@ TEST_P(SpdySessionTest, PingAndWriteLoop) { |
TEST_P(SpdySessionTest, DeleteExpiredPushStreams) { |
session_deps_.host_resolver->set_synchronous_mode(true); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
session_deps_.time_func = TheNearFuture; |
CreateNetworkSession(); |
@@ -958,9 +988,6 @@ TEST_P(SpdySessionTest, FailedPing) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -1025,9 +1052,6 @@ TEST_P(SpdySessionTest, OnSettings) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -1082,9 +1106,6 @@ TEST_P(SpdySessionTest, ClearSettings) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
// Initialize the SpdySetting with the default. |
@@ -1153,9 +1174,6 @@ TEST_P(SpdySessionTest, CancelPendingCreateStream) { |
data.set_connect_data(connect_data); |
session_deps_.socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateNetworkSession(); |
// Initialize the SpdySetting with 1 max concurrent streams. |
@@ -1256,9 +1274,6 @@ TEST_P(SpdySessionTest, SendInitialDataOnNewSession) { |
data.set_connect_data(connect_data); |
session_deps_.socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateNetworkSession(); |
spdy_session_pool_->http_server_properties()->SetSpdySetting( |
@@ -1309,9 +1324,6 @@ TEST_P(SpdySessionTest, Initialize) { |
data.set_connect_data(connect_data); |
session_deps_.socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -1354,9 +1366,6 @@ TEST_P(SpdySessionTest, CloseSessionOnError) { |
data.set_connect_data(connect_data); |
session_deps_.socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateNetworkSession(); |
CapturingBoundNetLog log; |
@@ -1429,15 +1438,12 @@ TEST_P(SpdySessionTest, OutOfOrderSynStreams) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url("http://www.google.com"); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream_lowest = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
@@ -1502,15 +1508,12 @@ TEST_P(SpdySessionTest, CancelStream) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url1, HIGHEST, BoundNetLog()); |
@@ -1519,7 +1522,7 @@ TEST_P(SpdySessionTest, CancelStream) { |
test::StreamDelegateDoNothing delegate1(spdy_stream1); |
spdy_stream1->SetDelegate(&delegate1); |
- GURL url2("http://www.google.com"); |
+ GURL url2(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream2 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url2, LOWEST, BoundNetLog()); |
@@ -1575,22 +1578,19 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoCreatedSelfClosingStreams) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM, |
session, url1, HIGHEST, BoundNetLog()); |
ASSERT_TRUE(spdy_stream1.get() != NULL); |
EXPECT_EQ(0u, spdy_stream1->stream_id()); |
- GURL url2("http://www.google.com"); |
+ GURL url2(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream2 = |
CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM, |
session, url2, LOWEST, BoundNetLog()); |
@@ -1649,22 +1649,19 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoCreatedMutuallyClosingStreams) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM, |
session, url1, HIGHEST, BoundNetLog()); |
ASSERT_TRUE(spdy_stream1.get() != NULL); |
EXPECT_EQ(0u, spdy_stream1->stream_id()); |
- GURL url2("http://www.google.com"); |
+ GURL url2(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream2 = |
CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM, |
session, url2, LOWEST, BoundNetLog()); |
@@ -1730,22 +1727,19 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoActivatedSelfClosingStreams) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url1, MEDIUM, BoundNetLog()); |
ASSERT_TRUE(spdy_stream1.get() != NULL); |
EXPECT_EQ(0u, spdy_stream1->stream_id()); |
- GURL url2("http://www.google.com"); |
+ GURL url2(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream2 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url2, MEDIUM, BoundNetLog()); |
@@ -1814,22 +1808,19 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoActivatedMutuallyClosingStreams) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url1, MEDIUM, BoundNetLog()); |
ASSERT_TRUE(spdy_stream1.get() != NULL); |
EXPECT_EQ(0u, spdy_stream1->stream_id()); |
- GURL url2("http://www.google.com"); |
+ GURL url2(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream2 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url2, MEDIUM, BoundNetLog()); |
@@ -1914,15 +1905,12 @@ TEST_P(SpdySessionTest, CloseActivatedStreamThatClosesSession) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url("http://www.google.com"); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url, MEDIUM, BoundNetLog()); |
@@ -2090,9 +2078,6 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -2101,7 +2086,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) { |
// Read the settings frame. |
data.RunFor(1); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url1, LOWEST, BoundNetLog()); |
@@ -2111,7 +2096,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) { |
spdy_stream1->SetDelegate(&delegate1); |
TestCompletionCallback callback2; |
- GURL url2("http://www.google.com"); |
+ GURL url2(kDefaultURL); |
SpdyStreamRequest request2; |
ASSERT_EQ(ERR_IO_PENDING, |
request2.StartRequest( |
@@ -2119,7 +2104,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) { |
session, url2, LOWEST, BoundNetLog(), callback2.callback())); |
TestCompletionCallback callback3; |
- GURL url3("http://www.google.com"); |
+ GURL url3(kDefaultURL); |
SpdyStreamRequest request3; |
ASSERT_EQ(ERR_IO_PENDING, |
request3.StartRequest( |
@@ -2213,9 +2198,6 @@ TEST_P(SpdySessionTest, CancelTwoStalledCreateStream) { |
data.set_connect_data(connect_data); |
session_deps_.socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -2229,7 +2211,7 @@ TEST_P(SpdySessionTest, CancelTwoStalledCreateStream) { |
ASSERT_TRUE(spdy_stream != NULL); |
} |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM, |
session, url1, LOWEST, BoundNetLog()); |
@@ -2237,7 +2219,7 @@ TEST_P(SpdySessionTest, CancelTwoStalledCreateStream) { |
EXPECT_EQ(0u, spdy_stream1->stream_id()); |
TestCompletionCallback callback2; |
- GURL url2("http://www.google.com"); |
+ GURL url2(kDefaultURL); |
SpdyStreamRequest request2; |
ASSERT_EQ(ERR_IO_PENDING, |
request2.StartRequest( |
@@ -2245,7 +2227,7 @@ TEST_P(SpdySessionTest, CancelTwoStalledCreateStream) { |
callback2.callback())); |
TestCompletionCallback callback3; |
- GURL url3("http://www.google.com"); |
+ GURL url3(kDefaultURL); |
SpdyStreamRequest request3; |
ASSERT_EQ(ERR_IO_PENDING, |
request3.StartRequest( |
@@ -2334,15 +2316,12 @@ TEST_P(SpdySessionTest, ReadDataWithoutYielding) { |
session_deps_.host_resolver->set_synchronous_mode(true); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url1, MEDIUM, BoundNetLog()); |
@@ -2428,15 +2407,12 @@ TEST_P(SpdySessionTest, TestYieldingDuringReadData) { |
session_deps_.host_resolver->set_synchronous_mode(true); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url1, MEDIUM, BoundNetLog()); |
@@ -2544,15 +2520,12 @@ TEST_P(SpdySessionTest, TestYieldingDuringAsyncReadData) { |
session_deps_.host_resolver->set_synchronous_mode(true); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url1, MEDIUM, BoundNetLog()); |
@@ -2618,15 +2591,12 @@ TEST_P(SpdySessionTest, GoAwayWhileInDoReadLoop) { |
session_deps_.host_resolver->set_synchronous_mode(true); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream1 = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url1, MEDIUM, BoundNetLog()); |
@@ -2864,7 +2834,7 @@ TEST_P(SpdySessionTest, CloseSessionOnIdleWhenPoolStalled) { |
HttpNetworkSession::NORMAL_SOCKET_POOL); |
// Create a SPDY session. |
- GURL url1("http://www.google.com"); |
+ GURL url1(kDefaultURL); |
SpdySessionKey key1(HostPortPair(url1.host(), 80), |
ProxyServer::Direct(), kPrivacyModeDisabled); |
base::WeakPtr<SpdySession> session1 = |
@@ -2968,7 +2938,7 @@ class StreamCreatingDelegate : public test::StreamDelegateDoNothing { |
virtual ~StreamCreatingDelegate() {} |
virtual void OnClose(int status) OVERRIDE { |
- GURL url("http://www.google.com"); |
+ GURL url(kDefaultURL); |
ignore_result( |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session_, url, MEDIUM, BoundNetLog())); |
@@ -3003,15 +2973,12 @@ TEST_P(SpdySessionTest, CreateStreamOnStreamReset) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
- GURL url("http://www.google.com"); |
+ GURL url(kDefaultURL); |
base::WeakPtr<SpdyStream> spdy_stream = |
CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, |
session, url, MEDIUM, BoundNetLog()); |
@@ -3072,9 +3039,6 @@ TEST_P(SpdySessionTest, UpdateStreamsSendWindowSize) { |
data->set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(data.get()); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -3134,9 +3098,6 @@ TEST_P(SpdySessionTest, AdjustRecvWindowSize) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
@@ -3224,9 +3185,6 @@ TEST_P(SpdySessionTest, SessionFlowControlInactiveStream) { |
data.set_connect_data(connect_data); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
CreateInsecureSpdySession(http_session_, key_, BoundNetLog()); |
@@ -3302,9 +3260,6 @@ TEST_P(SpdySessionTest, SessionFlowControlNoReceiveLeaks) { |
session_deps_.host_resolver->set_synchronous_mode(true); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -3380,9 +3335,6 @@ TEST_P(SpdySessionTest, SessionFlowControlNoSendLeaks) { |
session_deps_.host_resolver->set_synchronous_mode(true); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |
@@ -3472,9 +3424,6 @@ TEST_P(SpdySessionTest, SessionFlowControlEndToEnd) { |
session_deps_.host_resolver->set_synchronous_mode(true); |
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data); |
- SSLSocketDataProvider ssl(SYNCHRONOUS, OK); |
- session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl); |
- |
CreateDeterministicNetworkSession(); |
base::WeakPtr<SpdySession> session = |