Initial refactor to get profiles to propagate storage partition details.

chrome/browser/ui/webui/options/cookies_view_handler.cc

Index: chrome/browser/ui/webui/options/cookies_view_handler.cc
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index 065c3dc51829c12fd65897090aaeb2c235a88b74..659c3e6c4117378c13faf86ad19822fa11730046 100644
--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -25,6 +25,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
@@ -223,13 +225,19 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
     Profile* profile = Profile::FromWebUI(web_ui());
     ContainerMap apps_map;
     const ExtensionService* service = profile->GetExtensionService();
-    if (service) {
+    ExtensionProcessManager* process_manager =
+      profile->GetExtensionProcessManager();
+    if (service && process_manager) {
       const ExtensionSet* extensions = service->extensions();
       for (ExtensionSet::const_iterator it = extensions->begin();
            it != extensions->end(); ++it) {
         if ((*it)->is_storage_isolated()) {
+          content::SiteInstance* site = process_manager->GetSiteInstanceForURL(
+              (*it)->url());
+          content::StoragePartition* storage_partition =
+            site->GetProcess()->GetStoragePartition();
           net::URLRequestContextGetter* context_getter =
-              profile->GetRequestContextForStoragePartition((*it)->id());
+            storage_partition->GetURLRequestContext();
           // TODO(nasko): When new types of storage are isolated, add the
           // appropriate browsing data helper objects to the constructor.
           // For now, just cookies are isolated, so other parameters are NULL.