Mac: Minor fullscreen adjustments.

chrome/browser/ui/cocoa/presentation_mode_controller_unittest.mm

 // Copyright 2014 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 "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
@@ skipping 134 matching lines @@
   CheckLayoutNoOverlap(controller_);
 
   // No change after adjusting UI for Canonical Fullscreen.
   controller_->isInAppKitFullscreen_ = YES;
   [controller_
       adjustUIForSlidingFullscreenStyle:fullscreen_mac::OMNIBOX_TABS_PRESENT];
   EXPECT_EQ(windowHeight, MaxYInWindow([controller_ tabStripView]));
   CheckLayoutNoOverlap(controller_);
 
   // The menu bar is starting to animate in. All views should slide down by a
-  // small amount.
+  // small amount. The content area doesn't change size.
   [controller_->presentationController_ setMenuBarRevealProgress:0.3];
   EXPECT_LT(MaxYInWindow([controller_ tabStripView]), windowHeight - 1);
   EXPECT_GT(MaxYInWindow([controller_ tabStripView]),
             windowHeight - kMenuBarHeight + 1);
-  CheckLayoutNoOverlap(controller_);
+  CheckToolbarLayoutNoOverlap(controller_);
+  EXPECT_EQ(MinYInWindow([[controller_ bookmarkBarController] view]),
+            MaxYInWindow([[controller_ infoBarContainerController] view]));
+  EXPECT_LT(MinYInWindow([[controller_ infoBarContainerController] view]),
+            MaxYInWindow([controller_ tabContentArea]));
 
   // The menu bar is fully visible. All views should slide down by the size of
-  // the menu bar.
+  // the menu bar. The content area doesn't change size.
   [controller_->presentationController_ setMenuBarRevealProgress:1];
   EXPECT_FLOAT_EQ(windowHeight - kMenuBarHeight,
                   MaxYInWindow([controller_ tabStripView]));
-  CheckLayoutNoOverlap(controller_);
+  CheckToolbarLayoutNoOverlap(controller_);
+  EXPECT_EQ(MinYInWindow([[controller_ bookmarkBarController] view]),
+            MaxYInWindow([[controller_ infoBarContainerController] view]));
+  EXPECT_LT(MinYInWindow([[controller_ infoBarContainerController] view]),
+            MaxYInWindow([controller_ tabContentArea]));
 
   // The menu bar has disappeared. All views should return to normal.
   [controller_->presentationController_ setMenuBarRevealProgress:0];
   EXPECT_EQ(windowHeight, MaxYInWindow([controller_ tabStripView]));
   CheckLayoutNoOverlap(controller_);
 }
 
 // Tests the layout of views in Presentation Mode (emulating AppKit Fullscreen
 // API).
 TEST_F(PresentationModeControllerTest, PresentationModeAppKitLayout) {
   // Check initial layout.
   CGFloat windowHeight = NSHeight([[controller_ window] frame]);
   EXPECT_EQ(windowHeight, MaxYInWindow([controller_ tabStripView]));
   CheckLayoutNoOverlap(controller_);
 
   // Adjust UI for Presentation Mode.
   controller_->isInAppKitFullscreen_ = YES;
   [controller_
       adjustUIForSlidingFullscreenStyle:fullscreen_mac::OMNIBOX_TABS_HIDDEN];
 
   // In AppKit Fullscreen, the titlebar disappears. This test can't remove the
   // titlebar without non-trivially changing the view hierarchy. Instead, it
   // adjusts the expectations to sometimes use contentHeight instead of
   // windowHeight (the two should be the same in AppKit Fullscreen).
   CGFloat contentHeight = NSHeight([[[controller_ window] contentView] bounds]);
   CheckToolbarLayoutNoOverlap(controller_);
   EXPECT_EQ(windowHeight, MinYInWindow(LowestViewInToolbarArea(controller_)));
-  EXPECT_EQ(contentHeight, MaxYInWindow([controller_ tabContentArea]));
+  EXPECT_EQ(windowHeight, MaxYInWindow([controller_ tabContentArea]));
 
   // The menu bar is starting to animate in. All views except the content view
   // should slide down by a small amount.
   [controller_->presentationController_ setMenuBarRevealProgress:0.3];
   [controller_->presentationController_ changeToolbarFraction:0.3];
   CheckToolbarLayoutNoOverlap(controller_);
   EXPECT_LT(MinYInWindow(LowestViewInToolbarArea(controller_)), contentHeight);
   EXPECT_GT(MaxYInWindow(HighestViewInToolbarArea(controller_)), contentHeight);
-  EXPECT_EQ(contentHeight, MaxYInWindow([controller_ tabContentArea]));
+  EXPECT_EQ(windowHeight, MaxYInWindow([controller_ tabContentArea]));
 
   // The menu bar is fully visible. All views should slide down by the size of
   // the menu bar.
   [controller_->presentationController_ setMenuBarRevealProgress:1];
   [controller_->presentationController_ changeToolbarFraction:1];
   CheckToolbarLayoutNoOverlap(controller_);
   EXPECT_EQ(contentHeight, MaxYInWindow(HighestViewInToolbarArea(controller_)));
-  EXPECT_EQ(contentHeight, MaxYInWindow([controller_ tabContentArea]));
+  EXPECT_EQ(windowHeight, MaxYInWindow([controller_ tabContentArea]));
 
   // The menu bar has disappeared. All views should return to normal.
   [controller_->presentationController_ setMenuBarRevealProgress:0];
   [controller_->presentationController_ changeToolbarFraction:0];
   CheckToolbarLayoutNoOverlap(controller_);
   EXPECT_EQ(windowHeight, MinYInWindow(LowestViewInToolbarArea(controller_)));
-  EXPECT_EQ(contentHeight, MaxYInWindow([controller_ tabContentArea]));
+  EXPECT_EQ(windowHeight, MaxYInWindow([controller_ tabContentArea]));
 }