Move IndexedDBContext into the StoragePartition and ensure isolation.

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/profiles/profile.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/storage_partition.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace options {
 
 CookiesViewHandler::CookiesViewHandler()
   : batch_update_(false),
     app_context_(false),
     model_util_(new CookiesTreeModelUtil) {
@@ skipping 144 matching lines @@
   DCHECK(batch_update_);
   batch_update_ = false;
 
   SendChildren(model->GetRoot());
 }
 
 void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
   if (!app_context_ && !cookies_tree_model_.get()) {
     Profile* profile = Profile::FromWebUI(web_ui());
     ContainerMap apps_map;
+    content::StoragePartition* storage_partition =
+        content::BrowserContext::GetDefaultStoragePartition(profile);
+    content::IndexedDBContext* indexed_db_context =
+            storage_partition->GetIndexedDBContext();

[Charlie Reis, 2012/09/15 00:55:58]

nit: wrong indent

[awong, 2012/09/15 01:19:37]

Done.

     apps_map[std::string()] = new LocalDataContainer(
         "Site Data", std::string(),
         new BrowsingDataCookieHelper(profile->GetRequestContext()),
         new BrowsingDataDatabaseHelper(profile),
         new BrowsingDataLocalStorageHelper(profile),
         NULL,
         new BrowsingDataAppCacheHelper(profile),
-        BrowsingDataIndexedDBHelper::Create(profile),
+        BrowsingDataIndexedDBHelper::Create(indexed_db_context),
         BrowsingDataFileSystemHelper::Create(profile),
         BrowsingDataQuotaHelper::Create(profile),
         BrowsingDataServerBoundCertHelper::Create(profile),
         BrowsingDataFlashLSOHelper::Create(profile));
     cookies_tree_model_.reset(
         new CookiesTreeModel(apps_map,
                              profile->GetExtensionSpecialStoragePolicy(),
                              false));
     cookies_tree_model_->AddCookiesTreeObserver(this);
   }
@@ skipping 106 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