Use ShellPtr type in ApplicationLoader instead of untyped handles

shell/application_manager/application_manager.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 "shell/application_manager/application_manager.h"
 
 #include <stdio.h>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 122 matching lines @@
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services,
     ApplicationLoader* loader) {
   ShellImpl* shell = nullptr;
   URLToShellImplMap::const_iterator shell_it =
       url_to_shell_impl_.find(resolved_url);
   if (shell_it != url_to_shell_impl_.end()) {
     shell = shell_it->second;
   } else {
-    MessagePipe pipe;
+    ShellPtr shell_ptr;
     shell =
-        new ShellImpl(pipe.handle0.Pass(), this, requested_url, resolved_url);
+        new ShellImpl(GetProxy(&shell_ptr), this, requested_url, resolved_url);
     url_to_shell_impl_[resolved_url] = shell;
     shell->client()->Initialize(GetArgsForURL(requested_url));
 
-    loader->Load(this, resolved_url, pipe.handle1.Pass(),
+    loader->Load(this, resolved_url, shell_ptr.Pass(),
                  base::Bind(&ApplicationManager::LoadWithContentHandler,
                             weak_ptr_factory_.GetWeakPtr()));
   }
   ConnectToClient(shell, resolved_url, requestor_url, services.Pass(),
                   exposed_services.Pass());
 }
 
 void ApplicationManager::ConnectToClient(
     ShellImpl* shell_impl,
     const GURL& url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services) {
   shell_impl->ConnectToClient(requestor_url, services.Pass(),
                               exposed_services.Pass());
 }
 
 void ApplicationManager::RegisterExternalApplication(
     const GURL& url,
     ScopedMessagePipeHandle shell_handle) {
-  ShellImpl* shell_impl = new ShellImpl(shell_handle.Pass(), this, url, url);
+  ShellImpl* shell_impl =
+      new ShellImpl(MakeRequest<Shell>(shell_handle.Pass()), this, url, url);
   url_to_shell_impl_[url] = shell_impl;
   shell_impl->client()->Initialize(GetArgsForURL(url));
 }
 
 void ApplicationManager::LoadWithContentHandler(
     const GURL& content_handler_url,
     ScopedMessagePipeHandle shell_handle,
     URLResponsePtr url_response) {
   ContentHandlerConnection* connection = NULL;
   URLToContentHandlerMap::iterator iter =
@@ skipping 80 matching lines @@
   return pipe.handle0.Pass();
 }
 
 Array<String> ApplicationManager::GetArgsForURL(const GURL& url) {
   URLToArgsMap::const_iterator args_it = url_to_args_.find(url);
   if (args_it != url_to_args_.end())
     return Array<String>::From(args_it->second);
   return Array<String>();
 }
 }  // namespace mojo