bookmarks: Rename more entries from Group/group/GROUP to Folder/folder/FOLDER.

BUG=None
TEST=None

R=sky@chromium.org

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

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

2 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
index a7dd746..bb0dc31 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
@@ -38,22 +38,22 @@ class BookmarkAllTabsControllerTest : public CocoaTest {
   BrowserTestHelper helper_;
   const BookmarkNode* parent_node_;
   BookmarkAllTabsControllerOverride* controller_;
-  const BookmarkNode* group_a_;
+  const BookmarkNode* folder_a_;
 
   BookmarkAllTabsControllerTest() {
     BookmarkModel& model(*(helper_.profile()->GetBookmarkModel()));
     const BookmarkNode* root = model.GetBookmarkBarNode();
-    group_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
-    model.AddURL(group_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
-    model.AddURL(group_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com"));
-    model.AddURL(group_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com"));
+    folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
+    model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
+    model.AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com"));
+    model.AddURL(folder_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com"));
   }
 
   virtual BookmarkAllTabsControllerOverride* CreateController() {
     return [[BookmarkAllTabsControllerOverride alloc]
             initWithParentWindow:test_window()
                          profile:helper_.profile()
-                          parent:group_a_
+                          parent:folder_a_
                    configuration:BookmarkEditor::SHOW_TREE];
   }
 
@@ -72,11 +72,11 @@ class BookmarkAllTabsControllerTest : public CocoaTest {
 TEST_F(BookmarkAllTabsControllerTest, BookmarkAllTabs) {
   // OK button should always be enabled.
   EXPECT_TRUE([controller_ okButtonEnabled]);
-  [controller_ selectTestNodeInBrowser:group_a_];
+  [controller_ selectTestNodeInBrowser:folder_a_];
   [controller_ setDisplayName:@"ALL MY TABS"];
   [controller_ ok:nil];
-  EXPECT_EQ(4, group_a_->child_count());
-  const BookmarkNode* folderChild = group_a_->GetChild(3);
+  EXPECT_EQ(4, folder_a_->child_count());
+  const BookmarkNode* folderChild = folder_a_->GetChild(3);
   EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS"));
   EXPECT_EQ(3, folderChild->child_count());
 }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
index 6aec03f..a930b72 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
@@ -369,7 +369,7 @@ TEST_F(BookmarkEditorControllerTreeTest, ChangeBookmarkURLInPlace) {
   ASSERT_EQ(3, childIndex);
 }
 
-TEST_F(BookmarkEditorControllerTreeTest, ChangeBookmarkGroup) {
+TEST_F(BookmarkEditorControllerTreeTest, ChangeBookmarkFolder) {
   [controller_ selectTestNodeInBrowser:folder_c_];
   [controller_ ok:nil];
   UpdateBB3();
@@ -379,7 +379,7 @@ TEST_F(BookmarkEditorControllerTreeTest, ChangeBookmarkGroup) {
   ASSERT_EQ(4, childIndex);
 }
 
-TEST_F(BookmarkEditorControllerTreeTest, ChangeNameAndBookmarkGroup) {
+TEST_F(BookmarkEditorControllerTreeTest, ChangeNameAndBookmarkFolder) {
   [controller_ setDisplayName:@"NEW NAME"];
   [controller_ selectTestNodeInBrowser:folder_c_];
   [controller_ ok:nil];
@@ -391,7 +391,7 @@ TEST_F(BookmarkEditorControllerTreeTest, ChangeNameAndBookmarkGroup) {
   EXPECT_EQ(bookmark_bb_3_->GetTitle(), ASCIIToUTF16("NEW NAME"));
 }
 
-TEST_F(BookmarkEditorControllerTreeTest, AddFolderWithGroupSelected) {
+TEST_F(BookmarkEditorControllerTreeTest, AddFolderWithFolderSelected) {
   // Folders are NOT added unless the OK button is pressed.
   [controller_ newFolder:nil];
   [controller_ cancel:nil];