[Autofill] Move functions from the AutofillPopupController to AutofillPopupLayoutModel

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 "build/build_config.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 "components/autofill/core/browser/suggestion.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 {
 
 using testing::Return;
 using testing::ReturnRef;
 
 class MockAutofillPopupViewDelegate : public AutofillPopupViewDelegate {
  public:
   MOCK_METHOD0(Hide, void());
   MOCK_METHOD0(ViewDestroyed, void());
   MOCK_METHOD1(SetSelectionAtPoint, void(const gfx::Point&));
   MOCK_METHOD0(AcceptSelectedLine, bool());
   MOCK_METHOD0(SelectionCleared, void());
   // TODO(jdduke): Mock this method upon resolution of crbug.com/352463.
-  MOCK_CONST_METHOD0(popup_bounds, gfx::Rect&());
+  MOCK_CONST_METHOD0(popup_bounds, gfx::Rect());
   MOCK_METHOD0(container_view, gfx::NativeView());
   MOCK_CONST_METHOD0(element_bounds, gfx::RectF&());
   MOCK_CONST_METHOD0(IsRTL, bool());
+  MOCK_METHOD0(GetSuggestions, const std::vector<autofill::Suggestion>());
+#if !defined(OS_ANDROID)
+  MOCK_METHOD1(GetElidedValueWidthForRow, int(size_t));
+  MOCK_METHOD1(GetElidedLabelWidthForRow, int(size_t));
+#endif
 };
 
 }  // namespace
 
 class AutofillPopupBaseViewTest : public InProcessBrowserTest {
  public:
   AutofillPopupBaseViewTest() {}
   ~AutofillPopupBaseViewTest() override {}
 
   void SetUpOnMainThread() override {
@@ skipping 32 matching lines @@
 // Flaky on Win and Linux.  http://crbug.com/376299
 #if defined(OS_LINUX) || defined(OS_WIN)
 #define MAYBE_GestureTest DISABLED_GestureTest
 #else
 #define MAYBE_GestureTest GestureTest
 #endif
 
 IN_PROC_BROWSER_TEST_F(AutofillPopupBaseViewTest, MAYBE_GestureTest) {
   gfx::Rect bounds(0, 0, 5, 5);
   gfx::Point point = bounds.CenterPoint();
-  EXPECT_CALL(mock_delegate_, popup_bounds()).WillRepeatedly(ReturnRef(bounds));
+  EXPECT_CALL(mock_delegate_, popup_bounds()).WillRepeatedly(Return(bounds));
 
   ShowView();
 
   // Expectations.
   {
     testing::InSequence dummy;
     EXPECT_CALL(mock_delegate_, SetSelectionAtPoint(point)).Times(2);
     EXPECT_CALL(mock_delegate_, AcceptSelectedLine());
     EXPECT_CALL(mock_delegate_, SelectionCleared());
   }
@@ skipping 10 matching lines @@
 
   // Tapping outside the bounds clears any selection.
   ui::GestureEvent outside_tap = CreateGestureEvent(ui::ET_GESTURE_TAP,
                                                     gfx::Point(100, 100));
   SimulateGesture(&outside_tap);
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillPopupBaseViewTest, DoubleClickTest) {
   gfx::Rect bounds(0, 0, 5, 5);
   gfx::Point point = bounds.CenterPoint();
-  EXPECT_CALL(mock_delegate_, popup_bounds()).WillRepeatedly(ReturnRef(bounds));
+  EXPECT_CALL(mock_delegate_, popup_bounds()).WillRepeatedly(Return(bounds));
 
   ShowView();
 
   ui::MouseEvent mouse_down(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
                             gfx::Point(0, 0), ui::EventTimeForNow(), 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) {
   gfx::Rect bounds(100, 150, 5, 5);
-  EXPECT_CALL(mock_delegate_, popup_bounds()).WillRepeatedly(ReturnRef(bounds));
+  EXPECT_CALL(mock_delegate_, popup_bounds()).WillRepeatedly(Return(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