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 3f5eaba0ae60ca2f2e9c84aa56ee7526adbe11eb..e2e07da90572a4535352a68f4a760974cf2ac3ab 100644
--- a/mojo/shell/dynamic_application_loader.cc
+++ b/mojo/shell/dynamic_application_loader.cc
@@ -264,15 +264,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,
@@ -285,7 +278,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(),