Simple multi-url support for mojo apps

shell/application_manager/application_manager.h

Index: shell/application_manager/application_manager.h
diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h
index 9e3da2d97c769a945fdaa7683ddec717a2434401..3800df6a0dcb2bac737418cfb2f906f5d205bfae 100644
--- a/shell/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.h
@@ -150,7 +150,8 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
   typedef std::map<GURL, std::vector<std::string>> URLToArgsMap;
   typedef std::map<std::string, GURL> MimeTypeToURLMap;
 
-  bool ConnectToRunningApplication(const GURL& application_url,
+  bool ConnectToRunningApplication(const GURL& requested_url,
+                                   const GURL& application_url,
                                    const GURL& requestor_url,
                                    InterfaceRequest<ServiceProvider>* services,
                                    ServiceProviderPtr* exposed_services);
@@ -165,15 +166,17 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
 
   InterfaceRequest<Application> RegisterShell(
       const GURL& requested_url,
-      const GURL& resolved_url,
+      GURL resolved_url,
       const GURL& requestor_url,
       InterfaceRequest<ServiceProvider> services,
-      ServiceProviderPtr exposed_services);
+      ServiceProviderPtr exposed_services,
+      ShellImpl::QueryHandlingBehavior query_behavior);
 
   ShellImpl* GetShellImpl(const GURL& url);
 
   void ConnectToClient(ShellImpl* shell_impl,
-                       const GURL& url,
+                       const GURL& requested_url,
+                       const GURL& resolved_url,
                        const GURL& requestor_url,
                        InterfaceRequest<ServiceProvider> services,
                        ServiceProviderPtr exposed_services);