Instant Extended: Move omnibox dropdown by 2 pixels

chrome/browser/ui/cocoa/browser_window_controller_browsertest.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 "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #import "base/mac/mac_util.h"
 #include "base/run_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 371 matching lines @@
   view_list.push_back(VIEW_ID_DOWNLOAD_SHELF);
   VerifyZOrder(view_list);
 }
 
 // Verify that in non-Instant presentation mode the content area is beneath
 // the bookmark bar and info bar.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffset) {
   OverlayableContentsController* overlay =
       [controller() overlayableContentsController];
   // Just toolbar.
-  EXPECT_EQ(bookmarks::kBookmarkBarOverlap,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(1, [overlay activeContainerOffset]);
 
   // Plus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR),
-            [overlay activeContainerOffset]);
+  CGFloat bookmark_bar_offset =
+      GetViewHeight(VIEW_ID_BOOKMARK_BAR) - bookmarks::kBookmarkBarOverlap + 1;
+  EXPECT_EQ(bookmark_bar_offset, [overlay activeContainerOffset]);
 
   // Plus info bar.
   ShowInfoBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +
-            GetViewHeight(VIEW_ID_INFO_BAR),
+  EXPECT_EQ(bookmark_bar_offset + GetViewHeight(VIEW_ID_INFO_BAR),
             [overlay activeContainerOffset]);
 
   // Minus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + bookmarks::kBookmarkBarOverlap,
+  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + 1,
             [overlay activeContainerOffset]);
 }
 
 // Verify that in non-Instant presentation mode the content area is beneath
 // the info bar.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        DISABLED_ContentOffsetPresentationMode) {
   // TODO(kbr): re-enable: http://crbug.com/222296
   if (base::mac::IsOSMountainLionOrLater())
     return;
@@ skipping 42 matching lines @@
 }
 
 // The Instant NTP case is same as normal case except that the overlay is
 // also shifted down.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffsetInstantNTP) {
   ShowInstantNTP();
   OverlayableContentsController* overlay =
       [controller() overlayableContentsController];
 
   // Just toolbar.
-  EXPECT_EQ(bookmarks::kBookmarkBarOverlap,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(1, [overlay activeContainerOffset]);
 
   // Plus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR),
-            [overlay activeContainerOffset]);
+  CGFloat bookmark_bar_offset =
+      GetViewHeight(VIEW_ID_BOOKMARK_BAR) - bookmarks::kBookmarkBarOverlap + 1;
+  EXPECT_EQ(bookmark_bar_offset, [overlay activeContainerOffset]);
 
   // Plus info bar.
   ShowInfoBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +
-            GetViewHeight(VIEW_ID_INFO_BAR),
+  EXPECT_EQ(bookmark_bar_offset + GetViewHeight(VIEW_ID_INFO_BAR),
             [overlay activeContainerOffset]);
 
   // Minus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + bookmarks::kBookmarkBarOverlap,
+  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + 1,
             [overlay activeContainerOffset]);
 }
 
 // Verify that the find bar is positioned corerctly when a full page instant
 // search result is displayed.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, FindBarOffsetInstant) {
   // Add bookmark bar and find bar.
   browser()->window()->ToggleBookmarkBar();
   browser()->GetFindBarController();
 
+  CGFloat line_width = [GetViewWithID(VIEW_ID_FIND_BAR) cr_lineWidth];
   NSRect bookmark_bar_frame = [GetViewWithID(VIEW_ID_BOOKMARK_BAR) frame];
   NSRect find_bar_frame = [GetViewWithID(VIEW_ID_FIND_BAR) frame];
-  EXPECT_EQ(NSMinY(bookmark_bar_frame), NSMaxY(find_bar_frame) - 1);
+  EXPECT_EQ(NSMinY(bookmark_bar_frame), NSMaxY(find_bar_frame) - line_width);
 
   // Show instant and add a find bar to it.
   ShowInstantResults();
   browser()->GetFindBarController()->find_bar()->Show(false);;
 
   NSRect toolbar_bar_frame = [GetViewWithID(VIEW_ID_TOOLBAR) frame];
   find_bar_frame = [GetViewWithID(VIEW_ID_FIND_BAR) frame];
-  EXPECT_EQ(NSMinY(toolbar_bar_frame) - 1, NSMaxY(find_bar_frame));
+  EXPECT_EQ(NSMinY(toolbar_bar_frame) - bookmarks::kBookmarkBarOverlap + 1 -
+            line_width,
+            NSMaxY(find_bar_frame));
 }
 
 // Verify that if bookmark bar is underneath Instant search results then
 // clicking on Instant search results still works.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        InstantSearchResultsHitTest) {
   browser()->window()->ToggleBookmarkBar();
   ShowInstantResults();
 
   NSView* bookmarkView = [[controller() bookmarkBarController] view];
@@ skipping 87 matching lines @@
       [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]);
 
   ShowInstantResults();
   EXPECT_TRUE(
       [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]);
 
   HideInstant();
   EXPECT_FALSE(
       [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]);
 }