Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>.

apps/moterm/moterm_view.cc

 // Copyright 2015 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 "apps/moterm/moterm_view.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
 #include <algorithm>
 #include <string>
+#include <utility>
 
 #include "apps/moterm/key_util.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/files/interfaces/file.mojom.h"
 #include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
 #include "mojo/skia/ganesh_texture_surface.h"
@@ skipping 129 matching lines @@
       return;
     }
   }
 
   driver_ = MotermDriver::Create(this, terminal_file.Pass());
   DCHECK(on_closed_callback_.is_null());
   on_closed_callback_ = [callback] { callback.Run(mojo::files::Error::OK); };
 }
 
 void MotermView::ConnectToClient(
-    mojo::terminal::TerminalClientPtr terminal_client,
+    mojo::InterfaceHandle<mojo::terminal::TerminalClient> terminal_client,
     bool force,
     const ConnectToClientCallback& callback) {
   if (driver_) {
     // We already have a connection.
     if (force) {
       OnClosed();
     } else {
       // TODO(vtl): Is this error code right?
       callback.Run(mojo::files::Error::UNAVAILABLE);
       return;
     }
   }
 
-  mojo::files::FilePtr file;
+  mojo::InterfaceHandle<mojo::files::File> file;
   driver_ = MotermDriver::Create(this, GetProxy(&file));
-  terminal_client->ConnectToTerminal(file.Pass());
+  mojo::terminal::TerminalClientPtr::Create(std::move(terminal_client))
+      ->ConnectToTerminal(std::move(file));
   DCHECK(on_closed_callback_.is_null());
   on_closed_callback_ = [callback] { callback.Run(mojo::files::Error::OK); };
 }
 
 void MotermView::GetSize(const GetSizeCallback& callback) {
   MotermModel::Size size = model_.GetSize();
   callback.Run(mojo::files::Error::OK, size.rows, size.columns);
 }
 
 void MotermView::SetSize(uint32_t rows,
@@ skipping 124 matching lines @@
 
 void MotermView::OnKeyPressed(mojo::EventPtr key_event) {
   std::string input_sequence =
       GetInputSequenceForKeyPressedEvent(*key_event, keypad_application_mode_);
   if (input_sequence.empty())
     return;
 
   if (driver_)
     driver_->SendData(input_sequence.data(), input_sequence.size());
 }