Simple multi-url support for mojo apps

shell/application_manager/shell_impl.h

Index: shell/application_manager/shell_impl.h
diff --git a/shell/application_manager/shell_impl.h b/shell/application_manager/shell_impl.h
index 1748078911256b1a28dfbc49cdfe97c08f27443f..5b44e9ad06fb1a4ac57d3684285666ce2c156858 100644
--- a/shell/application_manager/shell_impl.h
+++ b/shell/application_manager/shell_impl.h
@@ -18,14 +18,16 @@ class ShellImpl : public Shell, public ErrorHandler {
  public:
   ShellImpl(ApplicationPtr application,
             ApplicationManager* manager,
-            const GURL& requested_url,
-            const GURL& url);
+            // The original URL that was first requested, before any resolution.
+            const GURL& original_url,
+            const GURL& resolved_url);
 
   ~ShellImpl() override;
 
   void InitializeApplication(Array<String> args);
 
-  void ConnectToClient(const GURL& requestor_url,
+  void ConnectToClient(const GURL& requested_url,
+                       const GURL& requestor_url,
                        InterfaceRequest<ServiceProvider> services,
                        ServiceProviderPtr exposed_services);