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

mojo/shell/application_manager.h

 // Copyright 2014 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.
 
 #ifndef MOJO_SHELL_APPLICATION_MANAGER_H_
 #define MOJO_SHELL_APPLICATION_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
@@ skipping 81 matching lines @@
 
  private:
   using IdentityToInstanceMap = std::map<Identity, ApplicationInstance*>;
   using IdentityToContentHandlerMap =
       std::map<Identity, ContentHandlerConnection*>;
   using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
 
   // 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,
       ApplicationInstance** instance);
 
   // Called once |fetcher| has found app. |params->app_url()| is the url of
   // the requested application before any mappings/resolution have been applied.
   // The corresponding URLRequest struct in |params| has been taken.
   void HandleFetchCallback(scoped_ptr<ConnectToApplicationParams> params,
                            scoped_ptr<Fetcher> fetcher);
@@ skipping 39 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 Shell::ConnectToApplicationCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_APPLICATION_MANAGER_H_