a bunch of bookmark bar changes

chrome/browser/cocoa/toolbar_controller_unittest.mm

 // Copyright (c) 2009 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>
 
 #import "base/scoped_nsobject.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class ToolbarControllerTest : public testing::Test {
  public:
 
   // Indexes that match the ordering returned by the private ToolbarController
   // |-toolbarViews| method.
   enum {
     kBackIndex, kForwardIndex, kReloadIndex, kHomeIndex, kStarIndex, kGoIndex,
-    kPageIndex, kWrenchIndex, kLocationIndex,
+    kPageIndex, kWrenchIndex, kLocationIndex, kBookmarkIndex,
   };
 
   ToolbarControllerTest() {
     Browser* browser = helper_.browser();
     CommandUpdater* updater = browser->command_updater();
     // The default state for the commands is true, set a couple to false to
     // ensure they get picked up correct on initialization
     updater->UpdateCommandEnabled(IDC_BACK, false);
     updater->UpdateCommandEnabled(IDC_FORWARD, false);
     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]];
   }
 
   // Make sure the enabled state of the view is the same as the corresponding
   // command in the updater. The views are in the declaration order of outlets.
   void CompareState(CommandUpdater* updater, NSArray* views) {
     EXPECT_EQ(updater->IsCommandEnabled(IDC_BACK),
               [[views objectAtIndex:kBackIndex] isEnabled] ? true : false);
@@ skipping 11 matching lines @@
   BrowserTestHelper helper_;
   scoped_nsobject<ToolbarController> bar_;
 };
 
 // Test the initial state that everything is sync'd up
 TEST_F(ToolbarControllerTest, InitialState) {
   CommandUpdater* updater = helper_.browser()->command_updater();
   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) {
   CommandUpdater* updater = helper_.browser()->command_updater();
   EXPECT_FALSE(updater->IsCommandEnabled(IDC_BACK));
   EXPECT_FALSE(updater->IsCommandEnabled(IDC_FORWARD));
   updater->UpdateCommandEnabled(IDC_BACK, true);
   updater->UpdateCommandEnabled(IDC_FORWARD, true);
   CompareState(updater, [bar_ toolbarViews]);
 }
@@ skipping 72 matching lines @@
   // Toggle the pref and make sure the buttons changed state and the other
   // views moved (or in the case of the location bar, it changed width).
   prefs->SetBoolean(prefs::kShowPageOptionsButtons, !showButtons);
   EXPECT_EQ(showButtons, [pageButton isHidden]);
   EXPECT_EQ(showButtons, [wrenchButton isHidden]);
   EXPECT_NE(NSMinX(originalGoFrame), NSMinX([goButton frame]));
   EXPECT_NE(NSWidth(originalLocationBarFrame), NSWidth([locationBar frame]));
 }
 
 }  // namespace