Fix positioning of children of NativeViewHostAura

chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc

 // 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.
 
 #include "chrome/browser/ui/views/autofill/autofill_popup_base_view.h"
 
 #include "chrome/browser/ui/autofill/autofill_popup_view_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace autofill {
 
 namespace {
@@ skipping 14 matching lines @@
 };
 
 }  // namespace
 
 class AutofillPopupBaseViewTest : public InProcessBrowserTest {
  public:
   AutofillPopupBaseViewTest() {}
   virtual ~AutofillPopupBaseViewTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    gfx::NativeWindow window = browser()->window()->GetNativeWindow();
+    gfx::NativeView native_view =
+        browser()->tab_strip_model()->GetActiveWebContents()->GetNativeView();
     EXPECT_CALL(mock_delegate_, container_view())
-        .WillRepeatedly(Return(window));
+        .WillRepeatedly(Return(native_view));
     EXPECT_CALL(mock_delegate_, ViewDestroyed());
 
-    view_ = new AutofillPopupBaseView(
-        &mock_delegate_,
-        views::Widget::GetWidgetForNativeWindow(window));
+    view_ =
+        new AutofillPopupBaseView(&mock_delegate_,
+                                  views::Widget::GetWidgetForNativeWindow(
+                                      browser()->window()->GetNativeWindow()));
   }
 
   void ShowView() {
     view_->DoShow();
   }
 
   ui::GestureEvent CreateGestureEvent(ui::EventType type, gfx::Point point) {
     return ui::GestureEvent(point.x(),
                             point.y(),
                             0,
@@ skipping 59 matching lines @@
                             gfx::Point(0, 0),
                             gfx::Point(0, 0),
                             0, 0);
   EXPECT_TRUE(static_cast<views::View*>(view_)->OnMousePressed(mouse_down));
 
   // Ignore double clicks.
   mouse_down.SetClickCount(2);
   EXPECT_FALSE(static_cast<views::View*>(view_)->OnMousePressed(mouse_down));
 }
 
+// Regression test for crbug.com/391316
+IN_PROC_BROWSER_TEST_F(AutofillPopupBaseViewTest, CorrectBoundsTest) {

[sky, 2014/07/18 15:33:49]

Could you create a more localized test for your change? There are already unit
tests for nativeviewhost.

[Evan Stade, 2014/07/18 18:22:53]

Done.

+  gfx::Rect bounds(100, 150, 5, 5);
+  EXPECT_CALL(mock_delegate_, popup_bounds()).WillRepeatedly(ReturnRef(bounds));
+
+  ShowView();
+
+  gfx::Point display_point =
+      static_cast<views::View*>(view_)->GetBoundsInScreen().origin();
+  gfx::Point expected_point = bounds.origin();
+  EXPECT_EQ(expected_point, display_point);
+}
+
 }  // namespace autofill