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 0b1d209183c8ae03a961020c95e59ddc8aec431a..4133b83d8e51f4efdf99dac908f6cf784fa9420d 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -209,8 +209,14 @@ GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
 
   const LocalSharedObjectsContainer& allowed_lsos =
       content_settings->allowed_local_shared_objects();
-  allowed_cookies_tree_model_.reset(
-      new CookiesTreeModel(allowed_lsos.cookies()->Clone(),
+  string16 name = ASCIIToUTF16("Drive-By-Web");
+  string16 id = ASCIIToUTF16("");
+
+  ContainerMap apps_map;
+
+  apps_map[name] =
+        new LocalDataContainer(name, id,
+                           allowed_lsos.cookies()->Clone(),
                            allowed_lsos.databases()->Clone(),
                            allowed_lsos.local_storages()->Clone(),
                            allowed_lsos.session_storages()->Clone(),
@@ -219,7 +225,9 @@ GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
                            allowed_lsos.file_systems()->Clone(),
                            NULL,
                            allowed_lsos.server_bound_certs()->Clone(),
-                           true));
+                           true);
+
+  allowed_cookies_tree_model_.reset(new CookiesTreeModel(apps_map));
   allowed_cookies_tree_adapter_.reset(
       new gtk_tree::TreeAdapter(this, allowed_cookies_tree_model_.get()));
   allowed_tree_ = gtk_tree_view_new_with_model(
@@ -297,8 +305,13 @@ GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
 
   const LocalSharedObjectsContainer& blocked_lsos =
       content_settings->blocked_local_shared_objects();
-  blocked_cookies_tree_model_.reset(
-      new CookiesTreeModel(blocked_lsos.cookies()->Clone(),
+  string16 name = ASCIIToUTF16("Drive-By-Web");
+  string16 id = ASCIIToUTF16("");
+  ContainerMap apps_map;
+
+  apps_map[name] =
+        new LocalDataContainer(name, id,
+                           blocked_lsos.cookies()->Clone(),
                            blocked_lsos.databases()->Clone(),
                            blocked_lsos.local_storages()->Clone(),
                            blocked_lsos.session_storages()->Clone(),
@@ -307,7 +320,9 @@ GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
                            blocked_lsos.file_systems()->Clone(),
                            NULL,
                            blocked_lsos.server_bound_certs()->Clone(),
-                           true));
+                           true);
+
+  blocked_cookies_tree_model_.reset(new CookiesTreeModel(apps_map));
   blocked_cookies_tree_adapter_.reset(
       new gtk_tree::TreeAdapter(this, blocked_cookies_tree_model_.get()));
   blocked_tree_ = gtk_tree_view_new_with_model(