Cache ShellImpl by resolved URL, not initial URL

mojo/application_manager/application_manager.h

Index: mojo/application_manager/application_manager.h
diff --git a/mojo/application_manager/application_manager.h b/mojo/application_manager/application_manager.h
index af74d8b7c068e400734ebf2546fb066298a16fdd..557969471b56b5ed5c7f8d76ea4b16332a8f4b96 100644
--- a/mojo/application_manager/application_manager.h
+++ b/mojo/application_manager/application_manager.h
@@ -25,7 +25,8 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
     virtual ~Delegate();
     // Send when the Application holding the handle on the other end of the
     // Shell pipe goes away.
-    virtual void OnApplicationError(const GURL& url) = 0;
+    virtual void OnApplicationError(const GURL& url);
+    virtual GURL ResolveURL(const GURL& url);
   };
 
   // API for testing.
@@ -55,14 +56,9 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
         ServiceProviderPtr service_provider) = 0;
   };
 
-  ApplicationManager();
+  ApplicationManager(Delegate* delegate);
   ~ApplicationManager();
 
-  // Returns a shared instance, creating it if necessary.

[Aaron Boodman, 2014/10/31 05:26:17]

Neither of these were called from anywhere.

-  static ApplicationManager* GetInstance();
-
-  void SetDelegate(Delegate* delegate) { delegate_ = delegate; }
-
   // Loads a service if necessary and establishes a new client connection.
   void ConnectToApplication(const GURL& application_url,
                             const GURL& requestor_url,
@@ -123,7 +119,8 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
                        const GURL& requestor_url,
                        ServiceProviderPtr service_provider);
 
-  void RegisterLoadedApplication(const GURL& service_url,
+  void RegisterLoadedApplication(const GURL& requested_url,
+                                 const GURL& resolved_url,
                                  const GURL& requestor_url,
                                  ServiceProviderPtr service_provider,
                                  ScopedMessagePipeHandle* shell_handle);