Cache ShellImpl by resolved URL, not initial URL

mojo/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 "mojo/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 200 matching lines @@
 void DynamicApplicationLoader::RegisterContentHandler(
     const std::string& mime_type,
     const GURL& content_handler_url) {
   mime_type_to_url_[mime_type] = content_handler_url;
 }
 
 void DynamicApplicationLoader::Load(
     ApplicationManager* manager,
     const GURL& url,
     scoped_refptr<LoadCallbacks> load_callbacks) {
-  GURL resolved_url;
-  if (url.SchemeIs("mojo")) {
-    resolved_url = context_->mojo_url_resolver()->Resolve(url);
-  } else {
-    resolved_url = url;
-  }
-
-  if (resolved_url.SchemeIsFile()) {
-    loaders_.push_back(new LocalLoader(resolved_url,
+  if (url.SchemeIsFile()) {
+    loaders_.push_back(new LocalLoader(url,
                                        context_,
                                        runner_factory_.get(),
                                        load_callbacks,
                                        loader_complete_callback_));
     return;
   }
 
   if (!network_service_) {
     context_->application_manager()->ConnectToService(
         GURL("mojo:network_service"), &network_service_);
   }
 
-  loaders_.push_back(new NetworkLoader(resolved_url,
+  loaders_.push_back(new NetworkLoader(url,
                                        &mime_type_to_url_,
                                        context_,
                                        runner_factory_.get(),
                                        network_service_.get(),
                                        load_callbacks,
                                        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