Unify the page and wrench menus into one wrench menu. Remove pref to hide men...

chrome/browser/cocoa/toolbar_controller_unittest.mm

 // Copyright (c) 2010 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 25 matching lines @@
 
 
 namespace {
 
 class ToolbarControllerTest : public CocoaTest {
  public:
 
   // Indexes that match the ordering returned by the private ToolbarController
   // |-toolbarViews| method.
   enum {
-    kBackIndex, kForwardIndex, kReloadIndex, kHomeIndex, kPageIndex,
+    kBackIndex, kForwardIndex, kReloadIndex, kHomeIndex,
     kWrenchIndex, kLocationIndex, kBrowserActionContainerViewIndex
   };
 
   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);
@@ skipping 118 matching lines @@
 
   // Toggle the pref and make sure the button changed state and the other
   // views moved.
   prefs->SetBoolean(prefs::kShowHomeButton, !showHome);
   EXPECT_EQ(showHome, [homeButton isHidden]);
   EXPECT_NE(NSMinX(originalReloadFrame), NSMinX([reloadButton frame]));
   EXPECT_NE(NSMinX(originalLocationBarFrame), NSMinX([locationBar frame]));
   EXPECT_NE(NSWidth(originalLocationBarFrame), NSWidth([locationBar frame]));
 }
 
-TEST_F(ToolbarControllerTest, TogglePageWrench) {
-  PrefService* prefs = helper_.profile()->GetPrefs();
-  bool showButtons = prefs->GetBoolean(prefs::kShowPageOptionsButtons);
-  NSView* pageButton = [[bar_ toolbarViews] objectAtIndex:kPageIndex];
-  NSView* wrenchButton = [[bar_ toolbarViews] objectAtIndex:kWrenchIndex];
-  EXPECT_EQ(showButtons, ![pageButton isHidden]);
-  EXPECT_EQ(showButtons, ![wrenchButton isHidden]);
-
-  NSView* locationBar = [[bar_ toolbarViews] objectAtIndex:kLocationIndex];
-  NSRect originalLocationBarFrame = [locationBar frame];
-
-  // 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(NSWidth(originalLocationBarFrame), NSWidth([locationBar frame]));
-}
-
 // Ensure that we don't toggle the buttons when we have a strip marked as not
 // having the full toolbar. Also ensure that the location bar doesn't change
 // size.
 TEST_F(ToolbarControllerTest, DontToggleWhenNoToolbar) {
   [bar_ setHasToolbar:NO hasLocationBar:YES];
   NSView* homeButton = [[bar_ toolbarViews] objectAtIndex:kHomeIndex];
-  NSView* pageButton = [[bar_ toolbarViews] objectAtIndex:kPageIndex];
-  NSView* wrenchButton = [[bar_ toolbarViews] objectAtIndex:kWrenchIndex];
   NSView* locationBar = [[bar_ toolbarViews] objectAtIndex:kLocationIndex];
   NSRect locationBarFrame = [locationBar frame];
   EXPECT_EQ([homeButton isHidden], YES);
-  EXPECT_EQ([pageButton isHidden], YES);
-  EXPECT_EQ([wrenchButton isHidden], YES);
   [bar_ showOptionalHomeButton];
   EXPECT_EQ([homeButton isHidden], YES);
   NSRect newLocationBarFrame = [locationBar frame];
   EXPECT_TRUE(NSEqualRects(locationBarFrame, newLocationBarFrame));
-  [bar_ showOptionalPageWrenchButtons];
-  EXPECT_EQ([pageButton isHidden], YES);
-  EXPECT_EQ([wrenchButton isHidden], YES);
   newLocationBarFrame = [locationBar frame];
   EXPECT_TRUE(NSEqualRects(locationBarFrame, newLocationBarFrame));
 }
 
 TEST_F(ToolbarControllerTest, StarIconInWindowCoordinates) {
   NSRect star = [bar_ starIconInWindowCoordinates];
   NSRect all = [[[bar_ view] window] frame];
 
   // Make sure the star is completely inside the window rect
   EXPECT_TRUE(NSContainsRect(all, star));
@@ skipping 22 matching lines @@
   [view setHitTestReturn:button];
   EXPECT_FALSE([bar_ hoverButtonForEvent:event]);
 
   // Now!
   scoped_nsobject<GradientButtonCell> cell([[GradientButtonCell alloc] init]);
   [button setCell:cell.get()];
   EXPECT_TRUE([bar_ hoverButtonForEvent:nil]);
 }
 
 }  // namespace