[Mac] Implement HTML5 database items in "Cookies and Other Data" dialog.

Code changes to support a new variant of CocoaCookieTreeNode that displays the information about web databases.

Changes to Cookies.xib: Added a new NSView "Database" in the existing information summary view for items selected in the cookie tree. This Database view provides the details for selected items that are web databases, and is in the same implement + layout style as the existing "Cookie" and "Local Storage" views. Added a key "databaseDescription" to the CocoaCookieTreeNode to support the display of the new node type.

TEST=manual testing in the "Cookies and Other Data" dialog
BUG=http://crbug.com/35191
Patch from Dan Clifford <danno@google.com>.

Review URL: http://codereview.chromium.org/596058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39882 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 57 insertions, 1 deletions

diff --git a/chrome/browser/cocoa/cookies_window_controller_unittest.mm b/chrome/browser/cocoa/cookies_window_controller_unittest.mm
index 224663f..deff1ee 100644
--- a/chrome/browser/cocoa/cookies_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/cookies_window_controller_unittest.mm
@@ -243,7 +243,7 @@ TEST_F(CookiesWindowControllerTest, TreeNodesRemoved) {
 
   controller_.reset(
       [[CookiesWindowController alloc] initWithProfile:profile
-                                         databaseHelper:database_helper_
+                                        databaseHelper:database_helper_
                                          storageHelper:local_storage_helper_]);
 
   // Root --> foo.com --> Cookies.
@@ -580,6 +580,62 @@ TEST_F(CookiesWindowControllerTest, UpdateFilter)
   EXPECT_EQ(1U, [[[controller_ cocoaTreeModel] children] count]);
 }
 
+TEST_F(CookiesWindowControllerTest, CreateDatabaseStorageNodes) {
+  TestingProfile* profile = browser_helper_.profile();
+  database_helper_ = new MockBrowsingDataDatabaseHelper(profile);
+  local_storage_helper_ = new MockBrowsingDataLocalStorageHelper(profile);
+  database_helper_->AddDatabaseSamples();
+  controller_.reset(
+      [[CookiesWindowController alloc] initWithProfile:profile
+                                        databaseHelper:database_helper_
+                                         storageHelper:local_storage_helper_]);
+  database_helper_->Notify();
+
+  ASSERT_EQ(2U, [[[controller_ cocoaTreeModel] children] count]);
+
+  // Root --> gdbhost1.
+  CocoaCookieTreeNode* node =
+      [[[controller_ cocoaTreeModel] children] objectAtIndex:0];
+  EXPECT_TRUE([@"gdbhost1" isEqualToString:[node title]]);
+  EXPECT_EQ(kCocoaCookieTreeNodeTypeFolder, [node nodeType]);
+  EXPECT_EQ(1U, [[node children] count]);
+
+  // host1 --> Web Databases.
+  node = [[node children] lastObject];
+  EXPECT_TRUE([@"Web Databases" isEqualToString:[node title]]);
+  EXPECT_EQ(kCocoaCookieTreeNodeTypeFolder, [node nodeType]);
+  EXPECT_EQ(1U, [[node children] count]);
+
+  // Database Storage --> db1.
+  node = [[node children] lastObject];
+  EXPECT_TRUE([@"db1" isEqualToString:[node title]]);
+  EXPECT_EQ(kCocoaCookieTreeNodeTypeDatabaseStorage, [node nodeType]);
+  EXPECT_TRUE([@"description 1" isEqualToString:[node databaseDescription]]);
+  EXPECT_TRUE([node lastModified]);
+  EXPECT_TRUE([node fileSize]);
+
+  // Root --> gdbhost2.
+  node =
+      [[[controller_ cocoaTreeModel] children] objectAtIndex:1];
+  EXPECT_TRUE([@"gdbhost2" isEqualToString:[node title]]);
+  EXPECT_EQ(kCocoaCookieTreeNodeTypeFolder, [node nodeType]);
+  EXPECT_EQ(1U, [[node children] count]);
+
+  // host1 --> Web Databases.
+  node = [[node children] lastObject];
+  EXPECT_TRUE([@"Web Databases" isEqualToString:[node title]]);
+  EXPECT_EQ(kCocoaCookieTreeNodeTypeFolder, [node nodeType]);
+  EXPECT_EQ(1U, [[node children] count]);
+
+  // Database Storage --> db2.
+  node = [[node children] lastObject];
+  EXPECT_TRUE([@"db2" isEqualToString:[node title]]);
+  EXPECT_EQ(kCocoaCookieTreeNodeTypeDatabaseStorage, [node nodeType]);
+  EXPECT_TRUE([@"description 2" isEqualToString:[node databaseDescription]]);
+  EXPECT_TRUE([node lastModified]);
+  EXPECT_TRUE([node fileSize]);
+}
+
 TEST_F(CookiesWindowControllerTest, CreateLocalStorageNodes) {
   TestingProfile* profile = browser_helper_.profile();
   net::CookieMonster* cm = profile->GetCookieMonster();