Revert "[Material][Mac] Reduced the area above tabs by 2 pts"

chrome/browser/ui/cocoa/browser_window_layout_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 <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
-#include "ui/base/material_design/material_design_controller.h"
-
-namespace {
-
-// In Material Design, the tabstrip's height is 2px smaller. As such, the
-// expected y values in the tests need to take account of the offset.
-
-int TabStripYOffset() {
-  return ui::MaterialDesignController::IsModeMaterial() ? 2 : 0;
-}
-
-int AvatarYOffset() {
-  return ui::MaterialDesignController::IsModeMaterial() ? 1 : 0;
-}
-
-} // namespace
 
 class BrowserWindowLayoutTest : public testing::Test {
  public:
   BrowserWindowLayoutTest() {}
   void SetUp() override {
     layout.reset([[BrowserWindowLayout alloc] init]);
 
     [layout setContentViewSize:NSMakeSize(600, 600)];
     [layout setWindowSize:NSMakeSize(600, 622)];
     [layout setInAnyFullscreen:NO];
@@ skipping 27 matching lines @@
     [layout setFullscreenMenubarOffset:0];
     [layout setFullscreenToolbarFraction:0];
     [layout setFullscreenButtonFrame:NSZeroRect];
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserWindowLayoutTest);
 };
 
 TEST_F(BrowserWindowLayoutTest, TestAllViews) {
-  int yOffset = TabStripYOffset();
   chrome::LayoutOutput output = [layout computeLayout];
 
-  EXPECT_NSEQ(NSMakeRect(0, 585 + yOffset, 600, 37 - yOffset),
-              output.tabStripLayout.frame);
-  EXPECT_NSEQ(NSMakeRect(502, 589 + AvatarYOffset(), 63, 28),
-              output.tabStripLayout.avatarFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 585, 600, 37), output.tabStripLayout.frame);
+  EXPECT_NSEQ(NSMakeRect(502, 589, 63, 28), output.tabStripLayout.avatarFrame);
   EXPECT_EQ(70, output.tabStripLayout.leftIndent);
   EXPECT_EQ(98, output.tabStripLayout.rightIndent);
-
-  EXPECT_NSEQ(NSMakeRect(0, 553 + yOffset, 600, 32), output.toolbarFrame);
-  EXPECT_NSEQ(NSMakeRect(0, 527 + yOffset, 600, 26), output.bookmarkFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 553, 600, 32), output.toolbarFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 527, 600, 26), output.bookmarkFrame);
   EXPECT_NSEQ(NSZeroRect, output.fullscreenBackingBarFrame);
-  EXPECT_EQ(527 + yOffset, output.findBarMaxY);
-  EXPECT_NSEQ(NSMakeRect(0, 455 + yOffset, 600, 111), output.infoBarFrame);
+  EXPECT_EQ(527, output.findBarMaxY);
+  EXPECT_NSEQ(NSMakeRect(0, 455, 600, 111), output.infoBarFrame);
   EXPECT_NSEQ(NSMakeRect(0, 0, 600, 44), output.downloadShelfFrame);
-  EXPECT_NSEQ(NSMakeRect(0, 44, 600, 411 + yOffset), output.contentAreaFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 44, 600, 411), output.contentAreaFrame);
 }
 
 TEST_F(BrowserWindowLayoutTest, TestAllViewsFullscreen) {
   ApplyStandardFullscreenLayoutParameters();
-  int yOffset = TabStripYOffset();
+
   chrome::LayoutOutput output = [layout computeLayout];
 
-  EXPECT_NSEQ(NSMakeRect(0, 585 + yOffset, 600, 37 - yOffset),
-              output.tabStripLayout.frame);
-  EXPECT_NSEQ(NSMakeRect(533, 589 + AvatarYOffset(), 63, 28),
-              output.tabStripLayout.avatarFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 585, 600, 37), output.tabStripLayout.frame);
+  EXPECT_NSEQ(NSMakeRect(533, 589, 63, 28), output.tabStripLayout.avatarFrame);
   EXPECT_EQ(0, output.tabStripLayout.leftIndent);
   EXPECT_FALSE(output.tabStripLayout.addCustomWindowControls);
   EXPECT_EQ(67, output.tabStripLayout.rightIndent);
-  EXPECT_NSEQ(NSMakeRect(0, 553 + yOffset, 600, 32), output.toolbarFrame);
-  EXPECT_NSEQ(NSMakeRect(0, 527 + yOffset, 600, 26), output.bookmarkFrame);
-  EXPECT_NSEQ(NSMakeRect(0, 527 + yOffset, 600, 95 - yOffset),
-              output.fullscreenBackingBarFrame);
-  EXPECT_EQ(527 + yOffset, output.findBarMaxY);
-  EXPECT_EQ(527 + yOffset, output.fullscreenExitButtonMaxY);
-  EXPECT_NSEQ(NSMakeRect(0, 455 + yOffset, 600, 111), output.infoBarFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 553, 600, 32), output.toolbarFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 527, 600, 26), output.bookmarkFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 527, 600, 95), output.fullscreenBackingBarFrame);
+  EXPECT_EQ(527, output.findBarMaxY);
+  EXPECT_EQ(527, output.fullscreenExitButtonMaxY);
+  EXPECT_NSEQ(NSMakeRect(0, 455, 600, 111), output.infoBarFrame);
   EXPECT_NSEQ(NSMakeRect(0, 0, 600, 44), output.downloadShelfFrame);
-  EXPECT_NSEQ(NSMakeRect(0, 44, 600, 411 + yOffset), output.contentAreaFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 44, 600, 411), output.contentAreaFrame);
 }
 
 // In fullscreen mode for Yosemite, the tab strip's left indent should be
 // sufficiently large to accomodate the addition of traffic light buttons.
 TEST_F(BrowserWindowLayoutTest, TestYosemiteFullscreenTrafficLights) {
   ApplyStandardFullscreenLayoutParameters();
   [layout setOSYosemiteOrLater:YES];
 
   chrome::LayoutOutput output = [layout computeLayout];
 
   EXPECT_EQ(70, output.tabStripLayout.leftIndent);
   EXPECT_TRUE(output.tabStripLayout.addCustomWindowControls);
 }
 
 TEST_F(BrowserWindowLayoutTest, TestAllViewsFullscreenMenuBarShowing) {
   ApplyStandardFullscreenLayoutParameters();
   [layout setFullscreenMenubarOffset:-10];
 
-  int yOffset = TabStripYOffset();
   chrome::LayoutOutput output = [layout computeLayout];
 
-  EXPECT_NSEQ(NSMakeRect(0, 575 + yOffset, 600, 37 - yOffset),
-              output.tabStripLayout.frame);
-  EXPECT_NSEQ(NSMakeRect(533, 579 + AvatarYOffset(), 63, 28),
-              output.tabStripLayout.avatarFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 575, 600, 37), output.tabStripLayout.frame);
+  EXPECT_NSEQ(NSMakeRect(533, 579, 63, 28), output.tabStripLayout.avatarFrame);
   EXPECT_EQ(0, output.tabStripLayout.leftIndent);
   EXPECT_FALSE(output.tabStripLayout.addCustomWindowControls);
   EXPECT_EQ(67, output.tabStripLayout.rightIndent);
-  EXPECT_NSEQ(NSMakeRect(0, 543 + yOffset, 600, 32), output.toolbarFrame);
-  EXPECT_NSEQ(NSMakeRect(0, 517 + yOffset, 600, 26), output.bookmarkFrame);
-  EXPECT_NSEQ(NSMakeRect(0, 517 + yOffset, 600, 95 - yOffset),
-              output.fullscreenBackingBarFrame);
-  EXPECT_EQ(517 + yOffset, output.findBarMaxY);
-  EXPECT_EQ(517 + yOffset, output.fullscreenExitButtonMaxY);
-  EXPECT_NSEQ(NSMakeRect(0, 445 + yOffset, 600, 111), output.infoBarFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 543, 600, 32), output.toolbarFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 517, 600, 26), output.bookmarkFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 517, 600, 95), output.fullscreenBackingBarFrame);
+  EXPECT_EQ(517, output.findBarMaxY);
+  EXPECT_EQ(517, output.fullscreenExitButtonMaxY);
+  EXPECT_NSEQ(NSMakeRect(0, 445, 600, 111), output.infoBarFrame);
   EXPECT_NSEQ(NSMakeRect(0, 0, 600, 44), output.downloadShelfFrame);
-  EXPECT_NSEQ(NSMakeRect(0, 44, 600, 411 + yOffset), output.contentAreaFrame);
+  EXPECT_NSEQ(NSMakeRect(0, 44, 600, 411), output.contentAreaFrame);
 }
 
 TEST_F(BrowserWindowLayoutTest, TestPopupWindow) {
   [layout setHasTabStrip:NO];
   [layout setHasToolbar:NO];
   [layout setHasLocationBar:YES];
   [layout setBookmarkBarHidden:YES];
   [layout setHasDownloadShelf:NO];
 
   chrome::LayoutOutput output = [layout computeLayout];
@@ skipping 69 matching lines @@
 
   EXPECT_NSEQ(NSMakeRect(0, 528, 600, 72), output.infoBarFrame);
 }
 
 // Tests that the avatar button is not aligned on the half pixel.
 TEST_F(BrowserWindowLayoutTest, TestAvatarButtonPixelAlignment) {
   [layout setAvatarSize:NSMakeSize(28, 28)];
 
   chrome::LayoutOutput output = [layout computeLayout];
 
-  EXPECT_NSEQ(NSMakeRect(537, 589 + AvatarYOffset(), 28, 28),
-              output.tabStripLayout.avatarFrame);
+  EXPECT_NSEQ(NSMakeRect(537, 589, 28, 28), output.tabStripLayout.avatarFrame);
 }