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

mojo/public/cpp/application/lib/application_impl.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 "mojo/public/cpp/application/application_impl.h"
 
 #include <utility>
 
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/lib/service_registry.h"
@@ skipping 19 matching lines @@
   MOJO_CHECK(shell_);
   MessagePipe pipe;
   shell_->CreateApplicationConnector(
       MakeRequest<ApplicationConnector>(pipe.handle1.Pass()));
   return InterfaceHandle<ApplicationConnector>(pipe.handle0.Pass(), 0u);
 }
 
 ApplicationConnection* ApplicationImpl::ConnectToApplication(
     const String& application_url) {
   MOJO_CHECK(shell_);
-  ServiceProviderPtr local_services;
+  InterfaceHandle<ServiceProvider> local_services;
   InterfaceRequest<ServiceProvider> local_request = GetProxy(&local_services);
   ServiceProviderPtr remote_services;
   shell_->ConnectToApplication(application_url, GetProxy(&remote_services),
-                               local_services.Pass());
+                               std::move(local_services));
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
       this, application_url, application_url, remote_services.Pass(),
       local_request.Pass());
   outgoing_service_registries_.emplace_back(registry);
   return registry;
 }
 
 void ApplicationImpl::WaitForInitialize() {
   if (!shell_)
     binding_.WaitForIncomingMethodCall();
 }
 
 void ApplicationImpl::UnbindConnections(
     InterfaceRequest<Application>* application_request,
     ShellPtr* shell) {
   *application_request = binding_.Unbind();
   shell->Bind(shell_.PassInterfaceHandle());
 }
 
-void ApplicationImpl::Initialize(ShellPtr shell,
+void ApplicationImpl::Initialize(InterfaceHandle<Shell> shell,
                                  Array<String> args,
                                  const mojo::String& url) {
-  shell_ = shell.Pass();
+  shell_ = ShellPtr::Create(std::move(shell));
   shell_.set_connection_error_handler([this]() {
     delegate_->Quit();
     incoming_service_registries_.clear();
     outgoing_service_registries_.clear();
     Terminate();
   });
   url_ = url;
   args_ = args.To<std::vector<std::string>>();
   delegate_->Initialize(this);
 }
 
 void ApplicationImpl::AcceptConnection(
     const String& requestor_url,
     InterfaceRequest<ServiceProvider> services,
-    ServiceProviderPtr exposed_services,
+    InterfaceHandle<ServiceProvider> exposed_services,
     const String& url) {
   std::unique_ptr<internal::ServiceRegistry> registry(
       new internal::ServiceRegistry(this, url, requestor_url,
-                                    exposed_services.Pass(), services.Pass()));
+                                    std::move(exposed_services),
+                                    services.Pass()));
   if (!delegate_->ConfigureIncomingConnection(registry.get()))
     return;
   incoming_service_registries_.push_back(std::move(registry));
 }
 
 void ApplicationImpl::RequestQuit() {
   delegate_->Quit();
   Terminate();
 }
 
 }  // namespace mojo