a bunch of bookmark bar changes

chrome/browser/cocoa/toolbar_controller_unittest.mm

Index: chrome/browser/cocoa/toolbar_controller_unittest.mm
===================================================================
--- chrome/browser/cocoa/toolbar_controller_unittest.mm	(revision 20198)
+++ chrome/browser/cocoa/toolbar_controller_unittest.mm	(working copy)
@@ -22,7 +22,7 @@
   // |-toolbarViews| method.
   enum {
     kBackIndex, kForwardIndex, kReloadIndex, kHomeIndex, kStarIndex, kGoIndex,
-    kPageIndex, kWrenchIndex, kLocationIndex,
+    kPageIndex, kWrenchIndex, kLocationIndex, kBookmarkIndex,
   };
 
   ToolbarControllerTest() {
@@ -35,7 +35,9 @@
     bar_.reset(
         [[ToolbarController alloc] initWithModel:browser->toolbar_model()
                                         commands:browser->command_updater()
-                                         profile:helper_.profile()]);
+                                         profile:helper_.profile()
+                                  webContentView:nil
+                                bookmarkDelegate:nil]);
     EXPECT_TRUE([bar_ view]);
     NSView* parent = [cocoa_helper_.window() contentView];
     [parent addSubview:[bar_ view]];
@@ -67,6 +69,12 @@
   CompareState(updater, [bar_ toolbarViews]);
 }
 
+// Make sure awakeFromNib created a bookmarkBarController
+TEST_F(ToolbarControllerTest, AwakeFromNibCreatesBMBController) {
+  EXPECT_TRUE([bar_ bookmarkBarController]);
+}
+
+
 // Make some changes to the enabled state of a few of the buttons and ensure
 // that we're still in sync.
 TEST_F(ToolbarControllerTest, UpdateEnabledState) {