[Mac] Fullscreen layout issues

chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller_unittest.mm

 // Copyright 2016 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/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 75 matching lines @@
 @end
 
 namespace {
 
 class FullscreenToolbarControllerTest : public testing::Test {
  public:
   FullscreenToolbarControllerTest() {}
   void SetUp() override {
     BOOL yes = YES;
     BOOL no = NO;
+    CGFloat menubarHeight = 22;
 
     bwc_ = [OCMockObject mockForClass:[BrowserWindowController class]];
     [[[bwc_ stub] andReturnValue:OCMOCK_VALUE(yes)]
         isKindOfClass:[BrowserWindowController class]];
     [[[bwc_ stub] andReturnValue:OCMOCK_VALUE(yes)] isInAppKitFullscreen];
     [[[bwc_ stub] andReturnValue:OCMOCK_VALUE(no)] isInImmersiveFullscreen];
+    [[[bwc_ stub] andReturnValue:OCMOCK_VALUE(menubarHeight)] menubarHeight];
     [[bwc_ stub] layoutSubviews];
 
     controller_.reset(
         [[FullscreenToolbarController alloc] initWithBrowserController:bwc_]);
     SetToolbarStyle(FullscreenToolbarStyle::TOOLBAR_HIDDEN);
 
     menubar_tracker_.reset([[MockFullscreenMenubarTracker alloc]
         initWithFullscreenToolbarController:nil]);
     [menubar_tracker_ setMenubarProgress:0.0];
     [controller_ setMenubarTracker:menubar_tracker_];
 
     mouse_tracker_.reset([[MockFullscreenToolbarMouseTracker alloc] init]);
     [controller_ setMouseTracker:mouse_tracker_];
 
     [controller_ animationController]->SetAnimationDuration(0.0);
 
     [controller_ setTestFullscreenMode:YES];
   }
 
   void TearDown() override { [controller_ setTestFullscreenMode:NO]; }
 
   void SetToolbarStyle(FullscreenToolbarStyle style) {
     [controller_ setToolbarStyle:style];
   }
 
   void CheckLayout(CGFloat toolbarFraction, CGFloat menubarFraction) {
     FullscreenToolbarLayout layout = [controller_ computeLayout];
     EXPECT_EQ(toolbarFraction, layout.toolbarFraction);
-    EXPECT_EQ(menubarFraction * [controller_ toolbarVerticalOffset],
-              layout.menubarOffset);
+    EXPECT_EQ(menubarFraction * -[bwc_ menubarHeight], layout.menubarOffset);
   }
 
   // A mock BrowserWindowController object.
   id bwc_;
 
   // The FullscreenToolbarController object being tested.
   base::scoped_nsobject<FullscreenToolbarController> controller_;
 
   // Mocks the state of the menubar.
   base::scoped_nsobject<MockFullscreenMenubarTracker> menubar_tracker_;
@@ skipping 148 matching lines @@
 
   // Move the mouse away from the toolbar. Toolbar should be fully visible.
   [mouse_tracker_ setMouseInside:NO];
   CheckLayout(1, 0);
 
   // Release the toolbar. Toolbar should be hidden.
   [locks releaseToolbarVisibilityForOwner:owner.get() withAnimation:NO];
 }
 
 }  // namespace