Initial refactor to get profiles to propagate storage partition details.

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 65a94f6b17a34114cf390b1a153695cc3d7d67ca..003664b7c33fdd5fa9ce390d1a83495327f17661 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -17,6 +17,7 @@
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
+#include "chrome/browser/profiles/storage_partition_descriptor.h"
 #include "content/public/browser/resource_context.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_network_session.h"
@@ -82,12 +83,12 @@ class ProfileIOData {
   ChromeURLRequestContext* GetExtensionsRequestContext() const;
   ChromeURLRequestContext* GetIsolatedAppRequestContext(
       ChromeURLRequestContext* main_context,
-      const std::string& app_id,
+      const StoragePartitionDescriptor& partition_descriptor,
       scoped_ptr<net::URLRequestJobFactory::Interceptor>
           protocol_handler_interceptor) const;
   ChromeURLRequestContext* GetIsolatedMediaRequestContext(
       ChromeURLRequestContext* app_context,
-      const std::string& app_id) const;
+      const StoragePartitionDescriptor& partition_descriptor) const;
 
   // These are useful when the Chrome layer is called from the content layer
   // with a content::ResourceContext, and they want access to Chrome data for
@@ -306,7 +307,9 @@ class ProfileIOData {
     net::URLRequestContext* request_context_;
   };
 
-  typedef base::hash_map<std::string, ChromeURLRequestContext*>
+  typedef std::map<StoragePartitionDescriptor,
+                   ChromeURLRequestContext*,
+                   StoragePartitionDescriptorLess>
       URLRequestContextMap;
 
   // --------------------------------------------
@@ -321,7 +324,7 @@ class ProfileIOData {
   // isolated app.
   virtual ChromeURLRequestContext* InitializeAppRequestContext(
       ChromeURLRequestContext* main_context,
-      const std::string& app_id,
+      const StoragePartitionDescriptor& details,
       scoped_ptr<net::URLRequestJobFactory::Interceptor>
           protocol_handler_interceptor) const = 0;
 
@@ -329,7 +332,7 @@ class ProfileIOData {
   // isolated app.
   virtual ChromeURLRequestContext* InitializeMediaRequestContext(
       ChromeURLRequestContext* original_context,
-      const std::string& app_id) const = 0;
+      const StoragePartitionDescriptor& details) const = 0;
 
   // These functions are used to transfer ownership of the lazily initialized
   // context from ProfileIOData to the URLRequestContextGetter.
@@ -338,13 +341,13 @@ class ProfileIOData {
   virtual ChromeURLRequestContext*
       AcquireIsolatedAppRequestContext(
           ChromeURLRequestContext* main_context,
-          const std::string& app_id,
+          const StoragePartitionDescriptor& partition_descriptor,
           scoped_ptr<net::URLRequestJobFactory::Interceptor>
               protocol_handler_interceptor) const = 0;
   virtual ChromeURLRequestContext*
       AcquireIsolatedMediaRequestContext(
           ChromeURLRequestContext* app_context,
-          const std::string& app_id) const = 0;
+          const StoragePartitionDescriptor& partition_descriptor) const = 0;
 
   // Returns the LoadTimeStats object to be used for this profile.
   virtual chrome_browser_net::LoadTimeStats* GetLoadTimeStats(