Reverting 24700.

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"
@@ skipping 177 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]));
 }
 
+TEST_F(ToolbarControllerTest, BookmarkBarResizes) {
+  NSView* bookmarkBarView = [[bar_ bookmarkBarController] view];
+  ASSERT_EQ(0, NSHeight([bookmarkBarView frame]));
+  [resizeDelegate_ setHeight:-1];
+
+  // Resize the bookmarkbar to 30px.  The toolbar should ask the delegate to
+  // resize to 64px.
+  [bar_ resizeView:bookmarkBarView newHeight:30];
+  EXPECT_EQ(64, [resizeDelegate_ height]);
+  EXPECT_EQ(30, NSHeight([bookmarkBarView frame]));
+
+  // Resize the bookmarkbar back to 0px.  Toolbar should be at 39px.
+  [bar_ resizeView:bookmarkBarView newHeight:0];
+  EXPECT_EQ(39, [resizeDelegate_ height]);
+  EXPECT_EQ(0, NSHeight([bookmarkBarView frame]));
+
+  // Resize the bookmarkbar to 5px.  Toolbar should stay at 39px.
+  [resizeDelegate_ setHeight:-1];
+  [bar_ resizeView:bookmarkBarView newHeight:5];
+  EXPECT_EQ(39, [resizeDelegate_ height]);
+  EXPECT_EQ(5, NSHeight([bookmarkBarView frame]));
+
+  // Resize the bookmarkbar to 6px.  Toolbar should grow to 40px.
+  [bar_ resizeView:bookmarkBarView newHeight:6];
+  EXPECT_EQ(40, [resizeDelegate_ height]);
+  EXPECT_EQ(6, NSHeight([bookmarkBarView frame]));
+}
+
 // Make sure, by default, the bookmark bar is the full width of the
 // toolbar.
 TEST_F(ToolbarControllerTest, BookmarkBarIsFullWidth) {
   // Set the pref to the bookmark bar is visible when the toolbar is
   // first created.
   helper_.profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
 
   // Create a new bar (after the pref is set)
   Browser* browser = helper_.browser();
   bar_.reset(
@@ skipping 36 matching lines @@
   EXPECT_LT(popupFrame.x(), NSMinX(locationFrame));
   EXPECT_GT(popupFrame.right(), NSMaxX(locationFrame));
 
   // Make sure the popup frame is positioned at the bottom of the location bar.
   EXPECT_EQ(popupFrame.bottom(), NSMinY(locationFrame));
 }
 
 
 
 }  // namespace