Fix FramedBrowserWindowTest.WindowWidgetLocation.

chrome/browser/ui/cocoa/framed_browser_window_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/debug/debugger.h"
 #include "base/memory/scoped_nsobject.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 82 matching lines @@
   NSData* hiddenTitleData = WindowContentsAsTIFF();
 
   // With our magic setting, the window with a title should look the
   // same as the window with an empty title.
   EXPECT_TRUE([window_ _isTitleHidden]);
   EXPECT_TRUE([emptyTitleData isEqualToData:hiddenTitleData]);
 }
 
 // Test to make sure that our window widgets are in the right place.
 TEST_F(FramedBrowserWindowTest, WindowWidgetLocation) {
-  // First without tabstrip.
+  BOOL yes = YES;
+  BOOL no = NO;
+
+  // First without a tabstrip.
+  id controller = [OCMockObject mockForClass:[BrowserWindowController class]];
+  [[[controller stub] andReturnValue:OCMOCK_VALUE(yes)]
+   isKindOfClass:[BrowserWindowController class]];

[Robert Sesek, 2011/11/15 15:22:43]

nit: indent 4

+  [[[controller expect] andReturnValue:OCMOCK_VALUE(no)] hasTabStrip];
+  [[[controller expect] andReturnValue:OCMOCK_VALUE(yes)] hasTitleBar];
+  [[[controller expect] andReturnValue:OCMOCK_VALUE(no)] isTabbedWindow];
+  [window_ setWindowController:controller];
+
   NSView* closeBoxControl = [window_ standardWindowButton:NSWindowCloseButton];
   EXPECT_TRUE(closeBoxControl);
   NSRect closeBoxFrame = [closeBoxControl frame];
   NSRect windowBounds = [window_ frame];
   windowBounds = [[window_ contentView] convertRect:windowBounds fromView:nil];
   windowBounds.origin = NSZeroPoint;
   EXPECT_EQ(NSMaxY(closeBoxFrame),
             NSMaxY(windowBounds) -
                 kFramedWindowButtonsWithoutTabStripOffsetFromTop);
   EXPECT_EQ(NSMinX(closeBoxFrame),
             kFramedWindowButtonsWithoutTabStripOffsetFromLeft);
 
   NSView* miniaturizeControl =
       [window_ standardWindowButton:NSWindowMiniaturizeButton];
   EXPECT_TRUE(miniaturizeControl);
   NSRect miniaturizeFrame = [miniaturizeControl frame];
   EXPECT_EQ(NSMaxY(miniaturizeFrame),
             NSMaxY(windowBounds) -
                 kFramedWindowButtonsWithoutTabStripOffsetFromTop);
   EXPECT_EQ(NSMinX(miniaturizeFrame),
             NSMaxX(closeBoxFrame) + [window_ windowButtonsInterButtonSpacing]);
 
   // Then with a tabstrip.
-  id controller = [OCMockObject mockForClass:[BrowserWindowController class]];
-  BOOL yes = YES;
-  BOOL no = NO;
+  controller = [OCMockObject mockForClass:[BrowserWindowController class]];
   [[[controller stub] andReturnValue:OCMOCK_VALUE(yes)]
    isKindOfClass:[BrowserWindowController class]];
   [[[controller expect] andReturnValue:OCMOCK_VALUE(yes)] hasTabStrip];
   [[[controller expect] andReturnValue:OCMOCK_VALUE(no)] hasTitleBar];
   [[[controller expect] andReturnValue:OCMOCK_VALUE(yes)] isTabbedWindow];
   [window_ setWindowController:controller];
 
   closeBoxControl = [window_ standardWindowButton:NSWindowCloseButton];
   EXPECT_TRUE(closeBoxControl);
   closeBoxFrame = [closeBoxControl frame];
   windowBounds = [window_ frame];
   windowBounds = [[window_ contentView] convertRect:windowBounds fromView:nil];
   windowBounds.origin = NSZeroPoint;
   EXPECT_EQ(NSMaxY(closeBoxFrame),
             NSMaxY(windowBounds) -
                 kFramedWindowButtonsWithTabStripOffsetFromTop);
   EXPECT_EQ(NSMinX(closeBoxFrame),
             kFramedWindowButtonsWithTabStripOffsetFromLeft);
 
   miniaturizeControl = [window_ standardWindowButton:NSWindowMiniaturizeButton];
   EXPECT_TRUE(miniaturizeControl);
   miniaturizeFrame = [miniaturizeControl frame];
   EXPECT_EQ(NSMaxY(miniaturizeFrame),
             NSMaxY(windowBounds) -
                 kFramedWindowButtonsWithTabStripOffsetFromTop);
   EXPECT_EQ(NSMinX(miniaturizeFrame),
             NSMaxX(closeBoxFrame) + [window_ windowButtonsInterButtonSpacing]);
   [window_ setWindowController:nil];
 }
-