Refactoring CookiesTreeModel to support multiple data sources.

chrome/browser/ui/views/collected_cookies_views.cc

Index: chrome/browser/ui/views/collected_cookies_views.cc
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index 91d8c584358ec815950b2347818bebb2b2116dc0..cb6cd393dbaebb0352b5f51f60f58cdaff97d56b 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -332,17 +332,23 @@ views::View* CollectedCookiesViews::CreateAllowedPane() {
 
   const LocalSharedObjectsContainer& allowed_lsos =
       content_settings->allowed_local_shared_objects();
-  allowed_cookies_tree_model_.reset(
-      new CookiesTreeModel(allowed_lsos.cookies()->Clone(),
-                           allowed_lsos.databases()->Clone(),
-                           allowed_lsos.local_storages()->Clone(),
-                           allowed_lsos.session_storages()->Clone(),
-                           allowed_lsos.appcaches()->Clone(),
-                           allowed_lsos.indexed_dbs()->Clone(),
-                           allowed_lsos.file_systems()->Clone(),
-                           NULL,
-                           allowed_lsos.server_bound_certs()->Clone(),
-                           true));
+
+  ContainerMap apps_map;
+  // TODO(nasko): once the app node of the tree is no longer visible, the
+  // name won't matter and should be changed to empty string.
+  apps_map[std::string()] = new LocalDataContainer(
+      "Site Data", std::string(),
+      allowed_lsos.cookies()->Clone(),
+      allowed_lsos.databases()->Clone(),
+      allowed_lsos.local_storages()->Clone(),
+      allowed_lsos.session_storages()->Clone(),
+      allowed_lsos.appcaches()->Clone(),
+      allowed_lsos.indexed_dbs()->Clone(),
+      allowed_lsos.file_systems()->Clone(),
+      NULL,
+      allowed_lsos.server_bound_certs()->Clone());
+
+  allowed_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, true));
   allowed_cookies_tree_ = new views::TreeView();
   allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get());
   allowed_cookies_tree_->SetRootShown(false);
@@ -400,17 +406,24 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {
   blocked_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   const LocalSharedObjectsContainer& blocked_lsos =
       content_settings->blocked_local_shared_objects();
-  blocked_cookies_tree_model_.reset(
-      new CookiesTreeModel(blocked_lsos.cookies()->Clone(),
-                           blocked_lsos.databases()->Clone(),
-                           blocked_lsos.local_storages()->Clone(),
-                           blocked_lsos.session_storages()->Clone(),
-                           blocked_lsos.appcaches()->Clone(),
-                           blocked_lsos.indexed_dbs()->Clone(),
-                           blocked_lsos.file_systems()->Clone(),
-                           NULL,
-                           blocked_lsos.server_bound_certs()->Clone(),
-                           true));
+
+  string16 name = ASCIIToUTF16("Site Data");
+  ContainerMap apps_map;
+  // TODO(nasko): once the app node of the tree is no longer visible, the
+  // name won't matter and should be changed to empty string.
+  apps_map[std::string()] = new LocalDataContainer(
+      "Site Data", std::string(),
+      blocked_lsos.cookies()->Clone(),
+      blocked_lsos.databases()->Clone(),
+      blocked_lsos.local_storages()->Clone(),
+      blocked_lsos.session_storages()->Clone(),
+      blocked_lsos.appcaches()->Clone(),
+      blocked_lsos.indexed_dbs()->Clone(),
+      blocked_lsos.file_systems()->Clone(),
+      NULL,
+      blocked_lsos.server_bound_certs()->Clone());
+
+  blocked_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, true));
   blocked_cookies_tree_ = new views::TreeView();
   blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get());
   blocked_cookies_tree_->SetRootShown(false);