Use ShellPtr type in ApplicationLoader instead of untyped handles

shell/dynamic_application_loader.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/dynamic_application_loader.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 392 matching lines @@
 void DynamicApplicationLoader::RegisterContentHandler(
     const std::string& mime_type,
     const GURL& content_handler_url) {
   DCHECK(content_handler_url.is_valid())
       << "Content handler URL is invalid for mime type " << mime_type;
   mime_type_to_url_[mime_type] = content_handler_url;
 }
 
 void DynamicApplicationLoader::Load(ApplicationManager* manager,
                                     const GURL& url,
-                                    ScopedMessagePipeHandle shell_handle,
+                                    ShellPtr shell,
                                     LoadCallback load_callback) {
   if (url.SchemeIsFile()) {
     loaders_.push_back(new LocalLoader(
         url, &mime_type_to_url_, context_, runner_factory_.get(),
-        shell_handle.Pass(), load_callback, loader_complete_callback_));
+        shell.PassMessagePipe(), load_callback, loader_complete_callback_));
     return;
   }
 
   if (!network_service_) {
     context_->application_manager()->ConnectToService(
         GURL("mojo:network_service"), &network_service_);
   }
 
-  loaders_.push_back(
-      new NetworkLoader(url, network_service_.get(), &mime_type_to_url_,
-                        context_, runner_factory_.get(), shell_handle.Pass(),
-                        load_callback, loader_complete_callback_));
+  loaders_.push_back(new NetworkLoader(
+      url, network_service_.get(), &mime_type_to_url_, context_,
+      runner_factory_.get(), shell.PassMessagePipe(), load_callback,
+      loader_complete_callback_));
 }
 
 void DynamicApplicationLoader::OnApplicationError(ApplicationManager* manager,
                                                   const GURL& url) {
   // TODO(darin): What should we do about service errors? This implies that
   // the app closed its handle to the service manager. Maybe we don't care?
 }
 
 void DynamicApplicationLoader::LoaderComplete(Loader* loader) {
   loaders_.erase(std::find(loaders_.begin(), loaders_.end(), loader));
 }
 
 }  // namespace shell
 }  // namespace mojo