ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/shell/package_manager/package_manager_impl.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 "mojo/shell/package_manager/package_manager_impl.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 163 matching lines @@
   // TODO(beng): this is eff'n weird.
   new NetworkFetcher(disable_cache_, std::move(request),
                      url_loader_factory_.get(), loader_callback);
 }
 
 uint32_t PackageManagerImpl::HandleWithContentHandler(
     Fetcher* fetcher,
     const Identity& source,
     const GURL& target_url,
     const CapabilityFilter& target_filter,
-    InterfaceRequest<mojom::Application>* application_request) {
+    InterfaceRequest<mojom::ShellClient>* request) {
   Identity content_handler_identity;
   URLResponsePtr response;
   if (ShouldHandleWithContentHandler(fetcher,
                                      target_url,
                                      target_filter,
                                      &content_handler_identity,
                                      &response)) {
     ContentHandlerConnection* connection =
         GetContentHandler(content_handler_identity, source);
-    connection->StartApplication(std::move(*application_request),
-                                 std::move(response));
+    connection->StartApplication(std::move(*request), std::move(response));
     return connection->id();
   }
   return mojom::Shell::kInvalidApplicationID;
 }
 
 bool PackageManagerImpl::IsURLInCatalog(const std::string& url) const {
   return catalog_.find(url) != catalog_.end();
 }
 
 std::string PackageManagerImpl::GetApplicationName(
@@ skipping 176 matching lines @@
     return;
 
   base::DictionaryValue* dictionary = nullptr;
   CHECK(manifest->GetAsDictionary(&dictionary));
   DeserializeApplication(dictionary);
   SerializeCatalog();
 }
 
 }  // namespace shell
 }  // namespace mojo