ChannelMojo: Don't signal Channel errors with lock held

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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 311 matching lines @@
   if (task_runner_->RunsTasksOnCurrentThread()) {
     listener_->OnChannelError();
   } else {
     task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&ChannelMojo::OnPipeError, weak_factory_.GetWeakPtr()));
   }
 }
 
 bool ChannelMojo::Send(Message* message) {
-  base::AutoLock lock(lock_);
-  if (!message_reader_) {
-    pending_messages_.push_back(base::WrapUnique(message));
-    // Counts as OK before the connection is established, but it's an
-    // error otherwise.
-    return waiting_connect_;
+  bool sent = false;
+  {
+    base::AutoLock lock(lock_);
+    if (!message_reader_) {
+      pending_messages_.push_back(base::WrapUnique(message));
+      // Counts as OK before the connection is established, but it's an
+      // error otherwise.
+      return waiting_connect_;
+    }
+
+    sent = message_reader_->Send(base::WrapUnique(message));
   }
 
-  if (!message_reader_->Send(base::WrapUnique(message))) {
+  if (!sent) {
     OnPipeError();
     return false;
   }
 
   return true;
 }
 
 bool ChannelMojo::IsSendThreadSafe() const {
   return false;
 }
@@ skipping 80 matching lines @@
     DCHECK(ok);
     if (!ok) {
       LOG(ERROR) << "Failed to add new Mojo handle.";
       return MOJO_RESULT_UNKNOWN;
     }
   }
   return MOJO_RESULT_OK;
 }
 
 }  // namespace IPC