Convert the AutocompletePopupPositioner into a BubblePositioner in preparatio...

chrome/browser/cocoa/toolbar_controller_unittest.mm

 // Copyright (c) 2009 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>
 
 #import "base/scoped_nsobject.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
@@ skipping 255 matching lines @@
 }
 
 TEST_F(ToolbarControllerTest, StarButtonInWindowCoordinates) {
   NSRect star = [bar_ starButtonInWindowCoordinates];
   NSRect all = [[[bar_ view] window] frame];
 
   // Make sure the star is completely inside the window rect
   EXPECT_TRUE(NSContainsRect(all, star));
 }
 
-TEST_F(ToolbarControllerTest, AutocompletePopupPosition) {
+TEST_F(ToolbarControllerTest, BubblePosition) {
   NSView* locationBar = [[bar_ toolbarViews] objectAtIndex:kLocationIndex];
 
   // The window frame (in window base coordinates).
   NSRect all = [[[bar_ view] window] frame];
   // The frame of the location bar in window base coordinates.
   NSRect locationFrame =
       [locationBar convertRect:[locationBar bounds] toView:nil];
-  // The frame of the popup in window base coordinates.
-  gfx::Rect popupFrame = [bar_ autocompletePopupPosition];
+  // The frame of the location stack in window base coordinates.  The horizontal
+  // coordinates here are used for the omnibox dropdown.
+  gfx::Rect locationStackFrame = [bar_ locationStackBounds];
 
-  // Make sure the popup starts to the left of and ends to the right of the
-  // location bar.
-  EXPECT_LT(popupFrame.x(), NSMinX(locationFrame));
-  EXPECT_GT(popupFrame.right(), NSMaxX(locationFrame));
-
-  // Make sure the popup frame is positioned above the bottom of the
-  // location bar.
-  EXPECT_GE(popupFrame.bottom(), NSMinY(locationFrame));
+  // Make sure the location stack starts to the left of and ends to the right of
+  // the location bar.
+  EXPECT_LT(locationStackFrame.x(), NSMinX(locationFrame));
+  EXPECT_GT(locationStackFrame.right(), NSMaxX(locationFrame));
 }
 
 TEST_F(ToolbarControllerTest, HoverButtonForEvent) {
   scoped_nsobject<HitView> view([[HitView alloc]
                                   initWithFrame:NSMakeRect(0,0,100,100)]);
   [bar_ setView:view];
   NSEvent* event = [NSEvent mouseEventWithType:NSMouseMoved
                                       location:NSMakePoint(10,10)
                                  modifierFlags:0
                                      timestamp:0
@@ skipping 13 matching lines @@
   EXPECT_FALSE([bar_ hoverButtonForEvent:event]);
 
   // Now!
   scoped_nsobject<GradientButtonCell> cell([[GradientButtonCell alloc] init]);
   [button setCell:cell.get()];
   EXPECT_TRUE([bar_ hoverButtonForEvent:nil]);
 }
 
 
 }  // namespace