ChannelMojo: Handle errors in pending message processing.

ipc/mojo/ipc_channel_mojo.cc

 // Copyright 2014 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 "ipc/mojo/ipc_channel_mojo.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "ipc/ipc_listener.h"
@@ skipping 153 matching lines @@
   return control_reader_->Connect();
 }
 
 void ChannelMojo::Close() {
   control_reader_.reset();
   message_reader_.reset();
   channel_info_.reset();
 }
 
 void ChannelMojo::OnConnected(mojo::ScopedMessagePipeHandle pipe) {
-  message_reader_ =
-      make_scoped_ptr(new internal::MessageReader(pipe.Pass(), this));
+  message_reader_ = CreateMessageReader(pipe.Pass());
 
   for (size_t i = 0; i < pending_messages_.size(); ++i) {
-    message_reader_->Send(make_scoped_ptr(pending_messages_[i]));
+    bool sent = message_reader_->Send(make_scoped_ptr(pending_messages_[i]));
     pending_messages_[i] = NULL;
+    if (!sent) {
+      pending_messages_.clear();
+      listener_->OnChannelError();
+      return;
+    }
   }
 
   pending_messages_.clear();
 
   listener_->OnChannelConnected(GetPeerPID());
 }
 
 void ChannelMojo::OnPipeClosed(internal::MessagePipeReader* reader) {
   Close();
 }
@@ skipping 23 matching lines @@
 ChannelHandle ChannelMojo::TakePipeHandle() {
   return bootstrap_->TakePipeHandle();
 }
 
 void ChannelMojo::OnMessageReceived(Message& message) {
   listener_->OnMessageReceived(message);
   if (message.dispatch_error())
     listener_->OnBadMessageReceived(message);
 }
 
+scoped_ptr<internal::MessageReader>
+ChannelMojo::CreateMessageReader(

[yzshen1, 2014/09/15 17:26:07]

nit: you could merge this line onto the previous one.

[Hajime Morrita, 2014/09/15 18:16:53]

Done.

+    mojo::ScopedMessagePipeHandle pipe) {
+  return make_scoped_ptr(new internal::MessageReader(pipe.Pass(), this));
+}
+
+
 #if defined(OS_POSIX) && !defined(OS_NACL)
 int ChannelMojo::GetClientFileDescriptor() const {
   return bootstrap_->GetClientFileDescriptor();
 }
 
 int ChannelMojo::TakeClientFileDescriptor() {
   return bootstrap_->TakeClientFileDescriptor();
 }
 
 // static
@@ skipping 47 matching lines @@
       handles->push_back(wrapped_handle);
     }
   }
 
   return MOJO_RESULT_OK;
 }
 
 #endif  // defined(OS_POSIX) && !defined(OS_NACL)
 
 }  // namespace IPC