Revert 190584 "Alternate NTP Mac: Show overlay at fixed position"

trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

Index: trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
===================================================================
--- trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm	(revision 190730)
+++ trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm	(working copy)
@@ -351,9 +351,9 @@
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffset) {
   OverlayableContentsController* overlay =
       [controller() overlayableContentsController];
+
   // Just toolbar.
-  EXPECT_EQ(bookmarks::kBookmarkBarOverlap - 1,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(0, [overlay activeContainerOffset]);
 
   // Plus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
@@ -363,13 +363,12 @@
   // Plus info bar.
   ShowInfoBar();
   EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +
-            GetViewHeight(VIEW_ID_INFO_BAR),
+                GetViewHeight(VIEW_ID_INFO_BAR),
             [overlay activeContainerOffset]);
 
   // Minus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + bookmarks::kBookmarkBarOverlap,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR), [overlay activeContainerOffset]);
 }
 
 // Verify that in non-Instant presentation mode the content area is beneath
@@ -403,9 +402,9 @@
 // Verify that when showing Instant results the content area overlaps the
 // bookmark bar and info bar.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffsetInstant) {
+  ShowInstantResults();
   OverlayableContentsController* overlay =
       [controller() overlayableContentsController];
-  ShowInstantResults();
 
   // Just toolbar.
   EXPECT_EQ(0, [overlay activeContainerOffset]);
@@ -425,14 +424,13 @@
 
 // The Instant NTP case is same as normal case except that the overlay is
 // also shifted down.
-IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffsetInstantNTP) {
+IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffsetInstantNPT) {
   ShowInstantNTP();
   OverlayableContentsController* overlay =
       [controller() overlayableContentsController];
 
   // Just toolbar.
-  EXPECT_EQ(bookmarks::kBookmarkBarOverlap - 1,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(0, [overlay activeContainerOffset]);
 
   // Plus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
@@ -442,13 +440,12 @@
   // Plus info bar.
   ShowInfoBar();
   EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +
-            GetViewHeight(VIEW_ID_INFO_BAR),
+                GetViewHeight(VIEW_ID_INFO_BAR),
             [overlay activeContainerOffset]);
 
   // Minus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + bookmarks::kBookmarkBarOverlap,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR), [overlay activeContainerOffset]);
 }
 
 // Verify that if bookmark bar is underneath Instant search results then