Revert of Don't use resolved url for instance identity in ApplicationManager

mojo/shell/application_manager.h

Index: mojo/shell/application_manager.h
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index c7ca5dd0a48456aec81a07c3a40b142fe6de43a6..25b23a551bd47e790be290d0daa6d1940dee2f69 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -99,6 +99,14 @@
   // Takes the contents of |params| only when it returns true.
   bool ConnectToRunningApplication(
       scoped_ptr<ConnectToApplicationParams>* params);
+  // |resolved_url| is the URL to load by |loader| (if loader is not null). It
+  // may be different from |(*params)->app_url()| because of mappings and
+  // resolution rules.
+  // Takes the contents of |params| only when it returns true.
+  void ConnectToApplicationWithLoader(
+      scoped_ptr<ConnectToApplicationParams>* params,
+      const GURL& resolved_url,
+      ApplicationLoader* loader);
 
   InterfaceRequest<Application> CreateInstance(
       scoped_ptr<ConnectToApplicationParams> params,