Mac/clang: First pass over unit_tests

chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm

 // Copyright (c) 2010 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 <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/bookmark_bar_constants.h"  // namespace bookmarks
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
@@ skipping 128 matching lines @@
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
     for (int i = 0; i < kLotsOfNodesCount; i++) {
       model->AddURL(folderA_, folderA_->GetChildCount(), L"repeated title",
                     GURL("http://www.google.com/repeated/url"));
     }
     return kLotsOfNodesCount;
   }
 
 
   // Return a simple BookmarkBarFolderController.
-  BookmarkBarFolderController* SimpleBookmarkBarFolderController() {
+  BookmarkBarFolderControllerPong* SimpleBookmarkBarFolderController() {
     BookmarkButton* parentButton = [[parentBarController_ buttons]
                                      objectAtIndex:0];
-    BookmarkBarFolderController* c =
+    BookmarkBarFolderControllerPong* c =
       [[BookmarkBarFolderControllerPong alloc]
                initWithParentButton:parentButton
                    parentController:nil
                       barController:parentBarController_];
     [c window];  // Force nib load.
     return c;
   }
 };
 
 TEST_F(BookmarkBarFolderControllerTest, InitCreateAndDelete) {
@@ skipping 468 matching lines @@
   [[toFolder target] performSelector:@selector(openBookmarkFolderFromButton:)
                           withObject:toFolder];
   BookmarkBarFolderController* folderController = [bar_ folderController];
   EXPECT_TRUE(folderController);
   NSWindow* toWindow = [folderController window];
   EXPECT_TRUE(toWindow);
   NSRect oldToWindowFrame = [toWindow frame];
   BookmarkButton* toSubfolder =
       [folderController buttonWithTitleEqualTo:@"4f2f"];
   ASSERT_TRUE(toSubfolder);
-  NSRect oldToSubfolderFrame = [toSubfolder frame];
   [[toSubfolder target] performSelector:@selector(openBookmarkFolderFromButton:)
                              withObject:toSubfolder];
   BookmarkBarFolderController* subfolderController =
       [folderController folderController];
   EXPECT_TRUE(subfolderController);
   NSWindow* toSubwindow = [subfolderController window];
   EXPECT_TRUE(toSubwindow);
   NSRect oldToSubwindowFrame = [toSubwindow frame];
   // Drag a bar button onto a bookmark (i.e. not a folder) in a folder
   // so it should end up below the target bookmark.
@@ skipping 593 matching lines @@
   [folder deleteBookmark:folder];
   EXPECT_FALSE([folder folderController]);
 }
 
 // TODO(jrg): draggingEntered: and draggingExited: trigger timers so
 // they are hard to test.  Factor out "fire timers" into routines
 // which can be overridden to fire immediately to make behavior
 // confirmable.
 // There is a similar problem with mouseEnteredButton: and
 // mouseExitedButton:.