Refactoring CookiesTreeModel to support multiple data sources.

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

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
 
 #include <vector>
 
 #include "base/mac/bundle_locations.h"
 #import "base/mac/mac_util.h"
@@ skipping 366 matching lines @@
 }
 
 // Initializes the |allowedTreeModel_| and |blockedTreeModel_|, and builds
 // the |cocoaAllowedTreeModel_| and |cocoaBlockedTreeModel_|.
 - (void)loadTreeModelFromTabContents {
   TabSpecificContentSettings* content_settings =
       tab_contents_->content_settings();
 
   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));
+
+  string16 name = ASCIIToUTF16("Site Data");
+  string16 browser_id;
+
+  {
+    ContainerMap apps_map;
+    apps_map[name] = new LocalDataContainer(
+        name, browser_id,
+        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;
+    apps_map[name] = new LocalDataContainer(
+        name, browser_id,
+        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;
   allowedTreeModel_->GetIcons(&skiaIcons);
   icons_.reset([[NSMutableArray alloc] init]);
   for (std::vector<gfx::ImageSkia>::iterator it = skiaIcons.begin();
        it != skiaIcons.end(); ++it) {
     [icons_ addObject:gfx::SkBitmapToNSImage(*it->bitmap())];
   }
 
@@ skipping 135 matching lines @@
       treeController = blockedTreeController_;
       break;
     default:
       NOTREACHED();
       return;
   }
   [detailsViewController_ configureBindingsForTreeController:treeController];
 }
 
 @end