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 356 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 - 1,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(1, [overlay activeContainerOffset]);
 
   // Plus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR),
-            [overlay activeContainerOffset]);
+  CGFloat bookmarkBarOffset =
+      GetViewHeight(VIEW_ID_BOOKMARK_BAR) - bookmarks::kBookmarkBarOverlap + 1;
+  EXPECT_EQ(bookmarkBarOffset, [overlay activeContainerOffset]);
 
   // Plus info bar.
   ShowInfoBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +
-            GetViewHeight(VIEW_ID_INFO_BAR),
+  EXPECT_EQ(bookmarkBarOffset + 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 - 1,
+  EXPECT_EQ(1,
             [overlay activeContainerOffset]);
 
   // Plus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR),
-            [overlay activeContainerOffset]);
+  CGFloat bookmarkBarOffset =
+      GetViewHeight(VIEW_ID_BOOKMARK_BAR) - bookmarks::kBookmarkBarOverlap + 1;
+  EXPECT_EQ(bookmarkBarOffset, [overlay activeContainerOffset]);
 
   // Plus info bar.
   ShowInfoBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +
-            GetViewHeight(VIEW_ID_INFO_BAR),
+  EXPECT_EQ(bookmarkBarOffset + 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 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();
 
@@ skipping 11 matching lines @@
 // results mode.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, InstantSearchResultsMode) {
   chrome::EnableInstantExtendedAPIForTesting();
   SearchMode mode(SearchMode::MODE_SEARCH_RESULTS, SearchMode::ORIGIN_SEARCH);
   browser()->search_model()->SetMode(mode);
   browser()->search_model()->SetTopBarsVisible(false);
   EXPECT_TRUE(browser()->search_model()->mode().is_search_results());
   EXPECT_EQ(browser_window_controller::kInstantUIFullPageResults,
             [controller() currentInstantUIState]);
 }