Refactoring CookiesTreeModel to support multiple data sources.

chrome/browser/ui/gtk/collected_cookies_gtk.cc

Index: chrome/browser/ui/gtk/collected_cookies_gtk.cc
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
index 4a629e78503d2d17a7af00451a56a22c41544f51..eca6f51e59e8f42e76f031ee34d792aebd5608f1 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/browser/local_data_container.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
@@ -210,17 +211,22 @@ GtkWidget* CollectedCookiesGtk::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[""] = new LocalDataContainer(
+      "Site Data", "",
+      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_adapter_.reset(
       new gtk_tree::TreeAdapter(this, allowed_cookies_tree_model_.get()));
   allowed_tree_ = gtk_tree_view_new_with_model(
@@ -299,17 +305,22 @@ GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
 
   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));
+
+  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[""] = new LocalDataContainer(
+      "Site Data", "",
+      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_adapter_.reset(
       new gtk_tree::TreeAdapter(this, blocked_cookies_tree_model_.get()));
   blocked_tree_ = gtk_tree_view_new_with_model(