Initial refactor to get profiles to propagate storage partition details.

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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #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"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace fileapi {
 class FileSystemContext;
 }
 
 namespace options {
@@ skipping 178 matching lines @@
         new CookiesTreeModel(apps_map,
                              profile->GetExtensionSpecialStoragePolicy(),
                              false));
     cookies_tree_model_->AddCookiesTreeObserver(this);
   }
 
   if (app_context_ && !app_cookies_tree_model_.get()) {
     Profile* profile = Profile::FromWebUI(web_ui());
     ContainerMap apps_map;
     const ExtensionService* service = profile->GetExtensionService();
-    if (service) {
+    ExtensionProcessManager* process_manager =
+        extensions::ExtensionSystem::Get(profile)->process_manager();
+    if (service && process_manager) {

[James Hawkins, 2012/10/30 17:40:53]

Save indentation and processing by returning early if !service:

if (!service)
  return;

ExtensionProcessManager* process_manager = ...
if (!process_manager)
  return;

// Do such and such, but with must less indentation.

[nasko, 2012/10/30 19:55:25]

Done.

       const ExtensionSet* extensions = service->extensions();
       for (ExtensionSet::const_iterator it = extensions->begin();
            it != extensions->end(); ++it) {
         if ((*it)->is_storage_isolated()) {
+          content::StoragePartition* storage_partition =
+              content::BrowserContext::GetStoragePartitionForSite(profile,
+                                                                  (*it)->url());
           net::URLRequestContextGetter* context_getter =
-              profile->GetRequestContextForStoragePartition((*it)->id());
+            storage_partition->GetURLRequestContext();

[Charlie Reis, 2012/10/30 17:47:48]

nit: 2 more spaces

[nasko, 2012/10/30 19:55:25]

Done.

           // 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.

[Charlie Reis, 2012/10/30 17:47:48]

Nasko, is this still true?  We do isolate other types of storage now.  I suppose
that's for another CL, but should this be updated?

[nasko, 2012/10/30 19:55:25]

Based on our discussion from yesterday, since isolated sites will not be
shipping, this code should be removed. I'll be filing a bug to undo the entire
App Data dialog work I did.

[Charlie Reis, 2012/10/30 20:13:07]

Ok.

           apps_map[(*it)->id()] = new LocalDataContainer(
               (*it)->name(), (*it)->id(),
               new BrowsingDataCookieHelper(context_getter),
               NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
         }
       }
       app_cookies_tree_model_.reset(
           new CookiesTreeModel(apps_map,
                                profile->GetExtensionSpecialStoragePolicy(),
                                false));
@@ skipping 81 matching lines @@
 std::string CookiesViewHandler::GetCallback(
      std::string method, CookiesTreeModel* model) {
   std::string callback("CookiesView");
 
   if (model == app_cookies_tree_model_)
     callback.append("App");
   return callback.append(".").append(method);
 }
 
 }  // namespace options