Remove MessageLoop::current()->RunUntilIdle() in net.

net/quic/quic_http_stream_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_http_stream.h"
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
+#include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/chunked_upload_data_stream.h"
 #include "net/base/elements_upload_data_stream.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/transport_security_state.h"
@@ skipping 600 matching lines @@
   ProcessPacket(
       ConstructServerDataPacket(3, false, !kFin, /*offset=*/0, kResponseBody));
   SpdyHeaderBlock trailers;
   size_t spdy_trailers_frame_length;
   trailers["foo"] = "bar";
   trailers[kFinalOffsetHeaderKey] = base::IntToString(strlen(kResponseBody));
   ProcessPacket(ConstructResponseTrailersPacket(
       4, kFin, trailers, &spdy_trailers_frame_length, &offset));
 
   // Make sure trailers are processed.
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(static_cast<int>(strlen(kResponseBody)),
             stream_->ReadResponseBody(read_buffer_.get(), read_buffer_->size(),
                                       callback_.callback()));
   EXPECT_TRUE(stream_->IsResponseBodyComplete());
 
   EXPECT_EQ(OK,
             stream_->ReadResponseBody(read_buffer_.get(), read_buffer_->size(),
                                       callback_.callback()));
 
@@ skipping 505 matching lines @@
 
   // Ack the request.
   ProcessPacket(ConstructServerAckPacket(1, 0, 0));
   EXPECT_EQ(ERR_IO_PENDING, stream_->ReadResponseHeaders(callback_.callback()));
 
   // Send the response with a body.
   SetResponse("404 OK", "hello world!");
   // In the course of processing this packet, the QuicHttpStream close itself.
   ProcessPacket(ConstructResponseHeadersPacket(2, kFin, nullptr));
 
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(AtEof());
 
   // QuicHttpStream::GetTotalSent/ReceivedBytes currently only includes the
   // headers and payload.
   EXPECT_EQ(static_cast<int64_t>(spdy_request_headers_frame_length),
             stream_->GetTotalSentBytes());
   // Zero since the stream is closed before processing the headers.
   EXPECT_EQ(0, stream_->GetTotalReceivedBytes());
 }
@@ skipping 28 matching lines @@
 
   // Ack the request.
   ProcessPacket(ConstructServerAckPacket(1, 0, 0));
   EXPECT_EQ(ERR_IO_PENDING, stream_->ReadResponseHeaders(callback_.callback()));
 
   // Send the response with a body.
   SetResponse("404 OK", "hello world!");
   // In the course of processing this packet, the QuicHttpStream close itself.
   ProcessPacket(ConstructResponseHeadersPacket(2, kFin, nullptr));
 
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(AtEof());
 
   // QuicHttpStream::GetTotalSent/ReceivedBytes currently only includes the
   // headers and payload.
   EXPECT_EQ(static_cast<int64_t>(spdy_request_headers_frame_length),
             stream_->GetTotalSentBytes());
   // Zero since the stream is closed before processing the headers.
   EXPECT_EQ(0, stream_->GetTotalReceivedBytes());
 }
@@ skipping 175 matching lines @@
   response_headers_ = promised_response_;
   size_t spdy_response_headers_frame_length;
   ProcessPacket(InnerConstructResponseHeadersPacket(
       1, promise_id_, false, &spdy_response_headers_frame_length));
 
   // Receive the promised response body.
   const char kResponseBody[] = "Hello world!";
   ProcessPacket(InnerConstructDataPacket(2, promise_id_, false, kFin, 0,
                                          kResponseBody, &server_maker_));
 
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   // Rendezvous should have succeeded now, so the promised stream
   // should point at our push stream, and we should be able read
   // headers and data from it.
   EXPECT_EQ(OK, callback_.WaitForResult());
 
   EXPECT_EQ(
       QuicHttpStreamPeer::GetQuicChromiumClientStream(promised_stream_.get())
           ->id(),
       promise_id_);
@@ skipping 154 matching lines @@
   response_headers_ = promised_response_;
   size_t spdy_response_headers_frame_length;
   ProcessPacket(InnerConstructResponseHeadersPacket(
       1, promise_id_, false, &spdy_response_headers_frame_length));
 
   // Receive the promised response body.
   const char kResponseBody[] = "Hello world!";
   ProcessPacket(InnerConstructDataPacket(2, promise_id_, false, kFin, 0,
                                          kResponseBody, &server_maker_));
 
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   // Rendezvous should have succeeded now, so the promised stream
   // should point at our push stream, and we should be able read
   // headers and data from it.
   EXPECT_EQ(OK, callback_.WaitForResult());
 
   EXPECT_EQ(
       QuicHttpStreamPeer::GetQuicChromiumClientStream(promised_stream_.get())
           ->id(),
       promise_id_);
@@ skipping 64 matching lines @@
   EXPECT_EQ(ERR_IO_PENDING, promised_stream_->SendRequest(
                                 headers_, &response_, callback_.callback()));
 
   // Receive the promised response headers.
   promised_response_["vary"] = "accept-encoding";
   response_headers_ = promised_response_;
   size_t spdy_response_headers_frame_length;
   ProcessPacket(InnerConstructResponseHeadersPacket(
       1, promise_id_, false, &spdy_response_headers_frame_length));
 
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   // Rendezvous should have failed due to vary mismatch, so the
   // promised stream should have been aborted, and instead we have a
   // new, regular client initiated stream.
   EXPECT_EQ(OK, callback_.WaitForResult());
 
   // Not a server-initiated stream.
   EXPECT_NE(
       QuicHttpStreamPeer::GetQuicChromiumClientStream(promised_stream_.get())
           ->id(),
@@ skipping 12 matching lines @@
   // client-initiated version of |promised_stream_| works as intended.
 
   // Ack the request.
   ProcessPacket(ConstructServerAckPacket(2, 0, 0));
 
   SetResponse("404 Not Found", string());
   size_t spdy_response_header_frame_length;
   ProcessPacket(InnerConstructResponseHeadersPacket(
       3, stream_id_ + 2, kFin, &spdy_response_header_frame_length));
 
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(OK, promised_stream_->ReadResponseHeaders(callback_.callback()));
   ASSERT_TRUE(response_.headers.get());
   EXPECT_EQ(404, response_.headers->response_code());
   EXPECT_TRUE(response_.headers->HasHeaderValue("Content-Type", "text/plain"));
   EXPECT_FALSE(response_.response_time.is_null());
   EXPECT_FALSE(response_.request_time.is_null());
 
   // There is no body, so this should return immediately.
   EXPECT_EQ(
       0, promised_stream_->ReadResponseBody(
              read_buffer_.get(), read_buffer_->size(), callback_.callback()));
   EXPECT_TRUE(promised_stream_->IsResponseBodyComplete());
 
   stream_->Close(true);
 
   EXPECT_TRUE(AtEof());
 
   // QuicHttpStream::GetTotalSent/ReceivedBytes currently only includes the
   // headers and payload.
   EXPECT_EQ(static_cast<int64_t>(spdy_request_header_frame_length),
             promised_stream_->GetTotalSentBytes());
   EXPECT_EQ(static_cast<int64_t>(spdy_response_header_frame_length),
             promised_stream_->GetTotalReceivedBytes());
 }
 
 }  // namespace test
 }  // namespace net