Refactoring CookiesTreeModel to support multiple data sources.

chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
index 0d516b30faf6fdf9972cb41c37d86e5067784c70..71667df3247d1438881fc1c3719f1ddb9b057cc3 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -383,30 +383,47 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
 
   const LocalSharedObjectsContainer& allowed_lsos =
       content_settings->allowed_local_shared_objects();
-  allowedTreeModel_.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());
+
+    allowedTreeModel_.reset(new CookiesTreeModel(apps_map, true));
+  }
+
   const LocalSharedObjectsContainer& blocked_lsos =
       content_settings->blocked_local_shared_objects();
-  blockedTreeModel_.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[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());
+
+    blockedTreeModel_.reset(new CookiesTreeModel(apps_map, true));
+  }
 
   // Convert the model's icons from Skia to Cocoa.
   std::vector<gfx::ImageSkia> skiaIcons;