Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_stream_unittest.cc

Issue 18546008: [SPDY] Use WeakPtr<SpdySession> everywhere but SpdySessionPool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test, other minor formatting/comment changes Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_stream.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_stream_unittest.cc
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index 623674f7c175e8eae4dad0547db627a4c10f4853..6a14d67d95277d7d71902501e80d5a2cfcbc157e 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -50,7 +50,7 @@ class SpdyStreamTest : public ::testing::Test,
session_deps_(GetParam()),
offset_(0) {}
- scoped_refptr<SpdySession> CreateDefaultSpdySession() {
+ base::WeakPtr<SpdySession> CreateDefaultSpdySession() {
SpdySessionKey key(HostPortPair("www.google.com", 80),
ProxyServer::Direct(),
kPrivacyModeDisabled);
@@ -145,7 +145,7 @@ TEST_P(SpdyStreamTest, SendDataAfterOpen) {
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -187,11 +187,11 @@ TEST_P(SpdyStreamTest, PushedStream) {
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> spdy_session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> spdy_session(CreateDefaultSpdySession());
// Conjure up a stream.
SpdyStream stream(SPDY_PUSH_STREAM,
- spdy_session.get(),
+ spdy_session,
GURL(),
DEFAULT_PRIORITY,
kSpdyStreamInitialWindowSize,
@@ -222,7 +222,7 @@ TEST_P(SpdyStreamTest, PushedStream) {
EXPECT_EQ("200", delegate.GetResponseHeaderValue(spdy_util_.GetStatusKey()));
- spdy_session->CloseSessionOnError(ERR_CONNECTION_CLOSED, "Closing session");
+ EXPECT_TRUE(spdy_session == NULL);
}
TEST_P(SpdyStreamTest, StreamError) {
@@ -258,7 +258,7 @@ TEST_P(SpdyStreamTest, StreamError) {
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -342,7 +342,7 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenRequestResponse) {
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -405,7 +405,7 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenBidirectional) {
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -465,7 +465,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeaders) {
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -523,7 +523,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersOnPush) {
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -598,7 +598,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersInHeadersFrame) {
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -678,7 +678,7 @@ TEST_P(SpdyStreamTest, DuplicateHeaders) {
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -747,7 +747,7 @@ TEST_P(SpdyStreamTest, IncreaseSendWindowSizeOverflow) {
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
GURL url(kStreamUrl);
base::WeakPtr<SpdyStream> stream =
@@ -838,7 +838,7 @@ void SpdyStreamTest::RunResumeAfterUnstallRequestResponseTest(
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
@@ -930,7 +930,7 @@ void SpdyStreamTest::RunResumeAfterUnstallBidirectionalTest(
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data);
- scoped_refptr<SpdySession> session(CreateDefaultSpdySession());
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
CreateStreamSynchronously(
« no previous file with comments | « net/spdy/spdy_stream.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698