Cache ShellImpl by resolved URL, not initial URL

mojo/shell/dynamic_application_loader.cc

Index: mojo/shell/dynamic_application_loader.cc
diff --git a/mojo/shell/dynamic_application_loader.cc b/mojo/shell/dynamic_application_loader.cc
index e1baea487dd0ed42dd5a15cc3fab5e2291bca6e9..7b9e838915fc0c6af0f00d2fb024a1c3e0477b02 100644
--- a/mojo/shell/dynamic_application_loader.cc
+++ b/mojo/shell/dynamic_application_loader.cc
@@ -218,15 +218,8 @@ 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,
@@ -239,7 +232,7 @@ void DynamicApplicationLoader::Load(
         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(),