Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

mojo/public/cpp/bindings/lib/connector.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 "mojo/public/cpp/bindings/lib/connector.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
 #include "mojo/public/cpp/bindings/error_handler.h"
@@ skipping 20 matching lines @@
 
 Connector::~Connector() {
   if (async_wait_id_)
     waiter_->CancelWait(waiter_, async_wait_id_);
 }
 
 void Connector::CloseMessagePipe() {
   Close(message_pipe_.Pass());
 }
 
+ScopedMessagePipeHandle Connector::ReleaseMessagePipe() {
+  if (async_wait_id_) {
+    waiter_->CancelWait(waiter_, async_wait_id_);
+    async_wait_id_ = 0;
+  }
+  return message_pipe_.Pass();
+}
+
 bool Connector::Accept(Message* message) {
+  assert(message_pipe_.is_valid());
+
   if (error_)
     return false;
 
   if (drop_writes_)
     return true;
 
   MojoResult rv = WriteMessageRaw(
       message_pipe_.get(),
       message->data(),
       message->data_num_bytes(),
@@ skipping 40 matching lines @@
 void Connector::OnHandleReady(MojoResult result) {
   async_wait_id_ = 0;
 
   if (result == MOJO_RESULT_OK) {
     ReadMore();
   } else {
     error_ = true;
   }
 
   if (error_ && error_handler_)
-    error_handler_->OnError();
+    error_handler_->OnConnectionError();
 }
 
 void Connector::WaitToReadMore() {
   async_wait_id_ = waiter_->AsyncWait(waiter_,
                                       message_pipe_.get().value(),
                                       MOJO_WAIT_FLAG_READABLE,
                                       MOJO_DEADLINE_INDEFINITE,
                                       &Connector::CallOnHandleReady,
                                       this);
 }
@@ skipping 10 matching lines @@
     if (rv != MOJO_RESULT_OK ||
         (enforce_errors_from_incoming_receiver_ && !receiver_result)) {
       error_ = true;
       break;
     }
   }
 }
 
 }  // namespace internal
 }  // namespace mojo