diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 17:35:13 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 17:35:13 +0000 |
| commit | 1653d32148fca4a2061a272d5dd8a028dcf827a7 (patch) | |
| tree | 438fab5999e61cb26db0ec536f1b95ddfa1be276 /net/spdy | |
| parent | 8bea43f3f9b607adf6b25f92e69e7dbcba6e6992 (diff) | |
| download | chromium_src-1653d32148fca4a2061a272d5dd8a028dcf827a7.zip chromium_src-1653d32148fca4a2061a272d5dd8a028dcf827a7.tar.gz chromium_src-1653d32148fca4a2061a272d5dd8a028dcf827a7.tar.bz2 | |
Fix remaining uses of WeakPtr<T>'s operator T* conversion
These cases weren't caught by the automated pass and/or needed
to be solved in another way than using .get().
BUG=245942
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/16207005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_write_queue_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/spdy/spdy_write_queue_unittest.cc b/net/spdy/spdy_write_queue_unittest.cc index 1865619..f287472 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; |