Index application by URL and identity for multiprocess.

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 52b0ec68f4e1916f4fc04e1a8e026095a763412a..3fa7f15fd1ec632658a2f89ccc32bc277b67480f 100644
--- a/shell/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.h
@@ -19,6 +19,7 @@
 #include "shell/application_manager/application_loader.h"
 #include "shell/application_manager/fetcher.h"
 #include "shell/application_manager/shell_impl.h"
+#include "shell/application_manager/url_and_identity.h"
 #include "url/gurl.h"
 
 namespace base {
@@ -168,7 +169,7 @@ class ApplicationManager {
 
   typedef std::map<std::string, ApplicationLoader*> SchemeToLoaderMap;
   typedef std::map<GURL, ApplicationLoader*> URLToLoaderMap;
-  typedef std::map<GURL, ShellImpl*> URLToShellImplMap;
+  typedef std::map<URLAndIdentity, ShellImpl*> URLAndIdentityToShellImplMap;
   typedef std::map<GURL, ContentHandlerConnection*> URLToContentHandlerMap;
   typedef std::map<GURL, std::vector<std::string>> URLToArgsMap;
   typedef std::map<std::string, GURL> MimeTypeToURLMap;
@@ -244,7 +245,7 @@ class ApplicationManager {
   scoped_ptr<ApplicationLoader> default_loader_;
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
 
-  URLToShellImplMap url_to_shell_impl_;
+  URLAndIdentityToShellImplMap url_to_shell_impl_;

[DaveMoore, 2015/03/06 17:32:08]

This is no longer url_to_shell_impl_. 

[qsr, 2015/03/09 16:22:47]

Done.

   URLToContentHandlerMap url_to_content_handler_;
   URLToArgsMap url_to_args_;
   // Note: The keys are URLs after mapping and resolving.