[Mac] Delete more bookmark bar folder code. This removes things that were missed last time.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm

 // Copyright (c) 2011 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/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
-#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #include "chrome/test/base/model_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
@@ skipping 125 matching lines @@
   EXPECT_NSEQ(@"subfolder", [[items objectAtIndex:3] title]);
   EXPECT_NSEQ(@"item 4", [[items objectAtIndex:4] title]);
   VerifyBottomItems(items);
 
   NSArray* subitems = [[[items objectAtIndex:3] submenu] itemArray];
   ASSERT_EQ(2 + kBottomItemCount, [subitems count]);
   EXPECT_NSEQ(@"subitem 1", [[subitems objectAtIndex:0] title]);
   EXPECT_NSEQ(@"subitem 2", [[subitems objectAtIndex:1] title]);
   VerifyBottomItems(subitems);
 }