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

Unified Diff: net/spdy/spdy_write_queue_unittest.cc

Issue 16207005: Fix remaining uses of WeakPtr<T>'s operator T* conversion (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/socket/ssl_client_socket_nss.cc ('k') | webkit/browser/quota/quota_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_write_queue_unittest.cc
diff --git a/net/spdy/spdy_write_queue_unittest.cc b/net/spdy/spdy_write_queue_unittest.cc
index 18656191b74e3b9c612cd47cc3aaeedfa98125a9..f287472a29d0b162b1b87dc96c3d89adfce09757 100644
--- a/net/spdy/spdy_write_queue_unittest.cc
+++ b/net/spdy/spdy_write_queue_unittest.cc
@@ -94,12 +94,12 @@ TEST_F(SpdyWriteQueueTest, DequeuesByPriority) {
ASSERT_TRUE(write_queue.Dequeue(&frame_type, &frame_producer, &stream));
EXPECT_EQ(RST_STREAM, frame_type);
EXPECT_EQ("HIGHEST", ProducerToString(frame_producer.Pass()));
- EXPECT_EQ(stream_highest, stream);
+ EXPECT_EQ(stream_highest, stream.get());
ASSERT_TRUE(write_queue.Dequeue(&frame_type, &frame_producer, &stream));
EXPECT_EQ(SYN_REPLY, frame_type);
EXPECT_EQ("MEDIUM", ProducerToString(frame_producer.Pass()));
- EXPECT_EQ(stream_medium, stream);
+ EXPECT_EQ(stream_medium, stream.get());
ASSERT_TRUE(write_queue.Dequeue(&frame_type, &frame_producer, &stream));
EXPECT_EQ(SYN_STREAM, frame_type);
@@ -135,17 +135,17 @@ TEST_F(SpdyWriteQueueTest, DequeuesFIFO) {
ASSERT_TRUE(write_queue.Dequeue(&frame_type, &frame_producer, &stream));
EXPECT_EQ(SYN_STREAM, frame_type);
EXPECT_EQ(1, ProducerToInt(frame_producer.Pass()));
- EXPECT_EQ(stream1, stream);
+ EXPECT_EQ(stream1, stream.get());
ASSERT_TRUE(write_queue.Dequeue(&frame_type, &frame_producer, &stream));
EXPECT_EQ(SYN_REPLY, frame_type);
EXPECT_EQ(2, ProducerToInt(frame_producer.Pass()));
- EXPECT_EQ(stream2, stream);
+ EXPECT_EQ(stream2, stream.get());
ASSERT_TRUE(write_queue.Dequeue(&frame_type, &frame_producer, &stream));
EXPECT_EQ(RST_STREAM, frame_type);
EXPECT_EQ(3, ProducerToInt(frame_producer.Pass()));
- EXPECT_EQ(stream3, stream);
+ EXPECT_EQ(stream3, stream.get());
EXPECT_FALSE(write_queue.Dequeue(&frame_type, &frame_producer, &stream));
}
@@ -174,7 +174,7 @@ TEST_F(SpdyWriteQueueTest, RemovePendingWritesForStream) {
ASSERT_TRUE(write_queue.Dequeue(&frame_type, &frame_producer, &stream));
EXPECT_EQ(SYN_STREAM, frame_type);
EXPECT_EQ(i, ProducerToInt(frame_producer.Pass()));
- EXPECT_EQ(stream1, stream);
+ EXPECT_EQ(stream1, stream.get());
}
SpdyFrameType frame_type = DATA;
@@ -218,7 +218,7 @@ TEST_F(SpdyWriteQueueTest, RemovePendingWritesForStreamsAfter) {
<< "Unable to Dequeue i: " << i;
EXPECT_EQ(SYN_STREAM, frame_type);
EXPECT_EQ(i, ProducerToInt(frame_producer.Pass()));
- EXPECT_EQ(stream1, stream);
+ EXPECT_EQ(stream1, stream.get());
}
SpdyFrameType frame_type = DATA;
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | webkit/browser/quota/quota_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698