[mac] Fixed FramedBrowserWindowTest.WindowWidgetLocation.

chrome/browser/ui/cocoa/framed_browser_window_unittest.mm

 // Copyright (c) 2012 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/mac/scoped_nsobject.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 85 matching lines @@
   [window_ display];
   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.
-// TODO(crbug.com/655112): Fails on Mac 10.11 Tests.
-TEST_F(FramedBrowserWindowTest, DISABLED_WindowWidgetLocation) {
+TEST_F(FramedBrowserWindowTest, WindowWidgetLocation) {
   BOOL yes = YES;
   BOOL no = NO;
 
   // First without a tabstrip.
   [window_ close];
   window_ = [[FramedBrowserWindow alloc]
              initWithContentRect:NSMakeRect(0, 0, 800, 600)
                      hasTabStrip:NO];
+  // Update window layout according to existing layout constraints.
+  [window_ layoutIfNeeded];
   id controller = [OCMockObject mockForClass:[BrowserWindowController class]];
   [[[controller stub] andReturnValue:OCMOCK_VALUE(yes)]
       isKindOfClass:[BrowserWindowController class]];
   [[[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 closeBoxFrame = [closeBoxControl convertRect:[closeBoxControl bounds]
+                                               toView:nil];
   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];
+  NSRect miniaturizeFrame =
+      [miniaturizeControl convertRect:[miniaturizeControl bounds]
+                               toView:nil];
   EXPECT_EQ(NSMaxY(miniaturizeFrame),
             NSMaxY(windowBounds) -
                 kFramedWindowButtonsWithoutTabStripOffsetFromTop);
   EXPECT_EQ(NSMinX(miniaturizeFrame),
             NSMaxX(closeBoxFrame) + [window_ windowButtonsInterButtonSpacing]);
   [window_ setWindowController:nil];
 
   // Then with a tabstrip.
   [window_ close];
   window_ = [[FramedBrowserWindow alloc]
              initWithContentRect:NSMakeRect(0, 0, 800, 600)
                      hasTabStrip:YES];
+  // Update window layout according to existing layout constraints.
+  [window_ layoutIfNeeded];
   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];
+  closeBoxFrame = [closeBoxControl convertRect:[closeBoxControl bounds]
+                                        toView:nil];
   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];
+  miniaturizeFrame = [miniaturizeControl convertRect:[miniaturizeControl bounds]
+                                              toView:nil];
   EXPECT_EQ(NSMaxY(miniaturizeFrame),
             NSMaxY(windowBounds) -
                 kFramedWindowButtonsWithTabStripOffsetFromTop);
   EXPECT_EQ(NSMinX(miniaturizeFrame),
             NSMaxX(closeBoxFrame) + [window_ windowButtonsInterButtonSpacing]);
   [window_ setWindowController:nil];
 }