Cache ShellImpl by resolved URL, not initial URL

mojo/shell/context.cc

 // Copyright 2013 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/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 141 matching lines @@
                   &request);
   }
 
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);
 };
 #endif
 
-Context::Context() {
+Context::Context() : application_manager_(this) {
   DCHECK(!base::MessageLoop::current());
 }
 
 Context::~Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
 void Context::Init() {
-  application_manager_.set_delegate(this);
   setup.Get();
   task_runners_.reset(
       new TaskRunners(base::MessageLoop::current()->message_loop_proxy()));
 
   for (size_t i = 0; i < arraysize(kLocalMojoURLs); ++i)
     mojo_url_resolver_.AddLocalFileMapping(GURL(kLocalMojoURLs[i]));
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kEnableExternalApplications)) {
@@ skipping 53 matching lines @@
             base::MessageLoop::TYPE_IO));
     application_manager_.SetLoaderForURL(loader.Pass(),
                                          GURL("mojo:network_service"));
   }
 #endif
 
   if (listener_)
     listener_->WaitForListening();
 }
 
-void Context::OnApplicationError(const GURL& gurl) {
-  if (app_urls_.find(gurl) != app_urls_.end()) {
-    app_urls_.erase(gurl);
+void Context::OnApplicationError(const GURL& url) {
+  if (app_urls_.find(url) != app_urls_.end()) {
+    app_urls_.erase(url);
     if (app_urls_.empty() && base::MessageLoop::current()->is_running())
       base::MessageLoop::current()->Quit();
   }
 }
 
+GURL Context::ResolveURL(const GURL& url) {
+  return mojo_url_resolver_.Resolve(url);
+}
+
 void Context::Run(const GURL& url) {
   EmptyServiceProvider* sp = new EmptyServiceProvider;
   ServiceProviderPtr spp;
   BindToProxy(sp, &spp);
 
   app_urls_.insert(url);
   application_manager_.ConnectToApplication(url, GURL(), spp.Pass());
 }
 
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(
       application_url, service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo