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

shell/application_manager/application_manager.h

Index: shell/application_manager/application_manager.h
diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h
index b5771809d5bc41028d6264d0067c3df28a08479a..8690d55b63f1d1734bd523f060c89809a8b47206 100644
--- a/shell/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.h
@@ -11,6 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
+#include "mojo/public/cpp/bindings/interface_handle.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
@@ -81,7 +82,7 @@ class ApplicationManager {
       const GURL& application_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::ServiceProviderPtr exposed_services,
+      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
       const base::Closure& on_application_end);
 
   template <typename Interface>
@@ -156,7 +157,7 @@ class ApplicationManager {
       const GURL& application_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::ServiceProviderPtr exposed_services,
+      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& pre_redirect_parameters);
 
@@ -164,13 +165,13 @@ class ApplicationManager {
       const GURL& resolved_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider>* services,
-      mojo::ServiceProviderPtr* exposed_services);
+      mojo::InterfaceHandle<mojo::ServiceProvider>* exposed_services);
 
   bool ConnectToApplicationWithLoader(
       const GURL& resolved_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider>* services,
-      mojo::ServiceProviderPtr* exposed_services,
+      mojo::InterfaceHandle<mojo::ServiceProvider>* exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& parameters,
       ApplicationLoader* loader);
@@ -188,22 +189,23 @@ class ApplicationManager {
       const GURL& resolved_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::ServiceProviderPtr exposed_services,
+      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& parameters);
 
   ShellImpl* GetShellImpl(const GURL& url);
 
-  void ConnectToClient(ShellImpl* shell_impl,
-                       const GURL& resolved_url,
-                       const GURL& requestor_url,
-                       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-                       mojo::ServiceProviderPtr exposed_services);
+  void ConnectToClient(
+      ShellImpl* shell_impl,
+      const GURL& resolved_url,
+      const GURL& requestor_url,
+      mojo::InterfaceRequest<mojo::ServiceProvider> services,
+      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services);
 
   void HandleFetchCallback(
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::ServiceProviderPtr exposed_services,
+      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& parameters,
       scoped_ptr<Fetcher> fetcher);