Replace MessageLoop::current() with ThreadTaskRunnerHandle::Get() in GCM

google_apis/gcm/engine/connection_handler_impl.cc

 // Copyright 2013 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 "google_apis/gcm/engine/connection_handler_impl.h"
 
-#include "base/message_loop/message_loop.h"
+#include "base/location.h"
+#include "base/thread_task_runner_handle.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/base/socket_stream.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
 
 using namespace google::protobuf::io;
 
@@ skipping 104 matching lines @@
     CodedOutputStream coded_output_stream(output_stream_.get());
     coded_output_stream.WriteRaw(version_byte, 1);
     coded_output_stream.WriteRaw(login_request_tag, 1);
     coded_output_stream.WriteVarint32(login_request.ByteSize());
     login_request.SerializeToCodedStream(&coded_output_stream);
   }
 
   if (output_stream_->Flush(
           base::Bind(&ConnectionHandlerImpl::OnMessageSent,
                      weak_ptr_factory_.GetWeakPtr())) != net::ERR_IO_PENDING) {
-    base::MessageLoop::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ConnectionHandlerImpl::OnMessageSent,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   read_timeout_timer_.Start(FROM_HERE,
                             read_timeout_,
                             base::Bind(&ConnectionHandlerImpl::OnTimeout,
                                        weak_ptr_factory_.GetWeakPtr()));
   WaitForData(MCS_VERSION_TAG_AND_SIZE);
@@ skipping 109 matching lines @@
     connection_callback_.Run(last_error);
     return;
   }
 
   // Check whether read is complete, or needs to be continued (
   // SocketInputStream::Refresh can finish without reading all the data).
   if (input_stream_->UnreadByteCount() < min_bytes_needed) {
     DVLOG(1) << "Socket read finished prematurely. Waiting for "
              << min_bytes_needed - input_stream_->UnreadByteCount()
              << " more bytes.";
-    base::MessageLoop::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ConnectionHandlerImpl::WaitForData,
                    weak_ptr_factory_.GetWeakPtr(),
                    MCS_PROTO_BYTES));
     return;
   }
 
   // Received enough bytes, process them.
   DVLOG(1) << "Processing MCS data: state == " << state;
   switch(state) {
@@ skipping 94 matching lines @@
     OnGotMessageBytes();
 }
 
 void ConnectionHandlerImpl::OnGotMessageBytes() {
   read_timeout_timer_.Stop();
   scoped_ptr<google::protobuf::MessageLite> protobuf(
       BuildProtobufFromTag(message_tag_));
   // Messages with no content are valid; just use the default protobuf for
   // that tag.
   if (protobuf.get() && message_size_ == 0) {
-    base::MessageLoop::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ConnectionHandlerImpl::GetNextMessage,
                    weak_ptr_factory_.GetWeakPtr()));
     read_callback_.Run(protobuf.Pass());
     return;
   }
 
   if (input_stream_->GetState() != SocketInputStream::READY) {
     LOG(ERROR) << "Failed to extract protobuf bytes of type "
                << static_cast<unsigned int>(message_tag_);
@@ skipping 49 matching lines @@
       read_timeout_timer_.Start(FROM_HERE,
                                 read_timeout_,
                                 base::Bind(&ConnectionHandlerImpl::OnTimeout,
                                            weak_ptr_factory_.GetWeakPtr()));
       WaitForData(MCS_PROTO_BYTES);
       return;
     }
   }
 
   input_stream_->RebuildBuffer();
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&ConnectionHandlerImpl::GetNextMessage,
                  weak_ptr_factory_.GetWeakPtr()));
   if (message_tag_ == kLoginResponseTag) {
     if (handshake_complete_) {
       LOG(ERROR) << "Unexpected login response.";
     } else {
       handshake_complete_ = true;
       DVLOG(1) << "GCM Handshake complete.";
       connection_callback_.Run(net::OK);
@@ skipping 18 matching lines @@
   message_tag_ = 0;
   message_size_ = 0;
   size_packet_so_far_ = 0;
   payload_input_buffer_.clear();
   input_stream_.reset();
   output_stream_.reset();
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace gcm