Mac/clang: First pass over unit_tests

chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm

Index: chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
index 8cefd9651a572bd5768a25909972883d60115b42..39546df2424d640a571b80ac152349c1e7b766c2 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
@@ -146,10 +146,10 @@ class BookmarkBarFolderControllerTest : public CocoaTest {
 
 
   // Return a simple BookmarkBarFolderController.
-  BookmarkBarFolderController* SimpleBookmarkBarFolderController() {
+  BookmarkBarFolderControllerPong* SimpleBookmarkBarFolderController() {
     BookmarkButton* parentButton = [[parentBarController_ buttons]
                                      objectAtIndex:0];
-    BookmarkBarFolderController* c =
+    BookmarkBarFolderControllerPong* c =
       [[BookmarkBarFolderControllerPong alloc]
                initWithParentButton:parentButton
                    parentController:nil
@@ -638,7 +638,6 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {
   BookmarkButton* toSubfolder =
       [folderController buttonWithTitleEqualTo:@"4f2f"];
   ASSERT_TRUE(toSubfolder);
-  NSRect oldToSubfolderFrame = [toSubfolder frame];
   [[toSubfolder target] performSelector:@selector(openBookmarkFolderFromButton:)
                              withObject:toSubfolder];
   BookmarkBarFolderController* subfolderController =