[Autofill] Move functions from the AutofillPopupController to AutofillPopupLayoutModel

chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc

 // 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.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
-#include "chrome/browser/ui/autofill/popup_constants.h"
-#include "chrome/browser/ui/autofill/test_popup_controller_common.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/test_autofill_client.h"
 #include "components/autofill/core/browser/test_autofill_external_delegate.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/components_scaled_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/text_utils.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::NiceMock;
 using base::ASCIIToUTF16;
 using base::WeakPtr;
 
@@ skipping 26 matching lines @@
   PrefService* GetPrefs() override { return prefs_.get(); }
 
  private:
   scoped_ptr<PrefService> prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAutofillClient);
 };
 
 class TestAutofillPopupController : public AutofillPopupControllerImpl {
  public:
-  explicit TestAutofillPopupController(
+  TestAutofillPopupController(
       base::WeakPtr<AutofillExternalDelegate> external_delegate,
       const gfx::RectF& element_bounds)
       : AutofillPopupControllerImpl(external_delegate,
                                     NULL,
                                     NULL,
                                     element_bounds,
-                                    base::i18n::UNKNOWN_DIRECTION),
-        test_controller_common_(
-            new TestPopupControllerCommon(element_bounds,
-                                          base::i18n::LEFT_TO_RIGHT)) {
-    controller_common_.reset(test_controller_common_);
-  }
+                                    base::i18n::UNKNOWN_DIRECTION) {}
   ~TestAutofillPopupController() override {}
 
-  void set_display(const gfx::Display& display) {
-    test_controller_common_->set_display(display);
-  }
-
   // Making protected functions public for testing
   using AutofillPopupControllerImpl::GetLineCount;
   using AutofillPopupControllerImpl::GetSuggestionAt;
   using AutofillPopupControllerImpl::GetElidedValueAt;
   using AutofillPopupControllerImpl::GetElidedLabelAt;
   using AutofillPopupControllerImpl::selected_line;
   using AutofillPopupControllerImpl::SetSelectedLine;
   using AutofillPopupControllerImpl::SelectNextLine;
   using AutofillPopupControllerImpl::SelectPreviousLine;
   using AutofillPopupControllerImpl::RemoveSelectedLine;
   using AutofillPopupControllerImpl::popup_bounds;
   using AutofillPopupControllerImpl::element_bounds;
 #if !defined(OS_ANDROID)
   using AutofillPopupControllerImpl::GetValueFontListForRow;
   using AutofillPopupControllerImpl::GetLabelFontList;
-  using AutofillPopupControllerImpl::RowWidthWithoutText;
 #endif
   using AutofillPopupControllerImpl::SetValues;
-  using AutofillPopupControllerImpl::GetDesiredPopupWidth;
-  using AutofillPopupControllerImpl::GetDesiredPopupHeight;
   using AutofillPopupControllerImpl::GetWeakPtr;
   MOCK_METHOD1(InvalidateRow, void(size_t));
   MOCK_METHOD0(UpdateBoundsAndRedrawPopup, void());
   MOCK_METHOD0(Hide, void());
 
   void DoHide() {
     AutofillPopupControllerImpl::Hide();
   }
 
  private:
   void ShowView() override {}
-
-  TestPopupControllerCommon* test_controller_common_;
 };
 
 }  // namespace
 
 class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
  public:
   AutofillPopupControllerUnitTest()
       : autofill_client_(new MockAutofillClient()),
         autofill_popup_controller_(NULL) {}
   ~AutofillPopupControllerUnitTest() override {}
@@ skipping 151 matching lines @@
 
   // Make sure next skips the unselectable separator.
   autofill_popup_controller_->SelectNextLine();
   EXPECT_EQ(2, autofill_popup_controller_->selected_line());
 
   // Make sure previous skips the unselectable separator.
   autofill_popup_controller_->SelectPreviousLine();
   EXPECT_EQ(0, autofill_popup_controller_->selected_line());
 }
 
-TEST_F(AutofillPopupControllerUnitTest, RowWidthWithoutText) {
-  // Give elements 1 and 3 subtexts and elements 2 and 3 icons, to ensure
-  // all combinations of subtexts and icons.
-  std::vector<Suggestion> suggestions;
-  suggestions.push_back(Suggestion("", "", "", 0));
-  suggestions.push_back(Suggestion("", "x", "", 0));
-  suggestions.push_back(Suggestion("", "", "americanExpressCC", 0));
-  suggestions.push_back(Suggestion("", "x", "genericCC", 0));
-
-  // Set up some visible display so the text values are kept.
-  gfx::Display display(0, gfx::Rect(0, 0, 100, 100));
-  autofill_popup_controller_->set_display(display);
-
-  autofill_popup_controller_->Show(suggestions);
-
-  int base_size =
-      AutofillPopupView::kEndPadding * 2 +
-      kPopupBorderThickness * 2;
-  int subtext_increase = AutofillPopupView::kNamePadding;
-
-  EXPECT_EQ(base_size, autofill_popup_controller_->RowWidthWithoutText(0));
-  EXPECT_EQ(base_size + subtext_increase,
-            autofill_popup_controller_->RowWidthWithoutText(1));
-  EXPECT_EQ(base_size + AutofillPopupView::kIconPadding +
-                ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-                    IDR_AUTOFILL_CC_AMEX).Width(),
-            autofill_popup_controller_->RowWidthWithoutText(2));
-  EXPECT_EQ(base_size + subtext_increase + AutofillPopupView::kIconPadding +
-                ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-                    IDR_AUTOFILL_CC_GENERIC).Width(),
-            autofill_popup_controller_->RowWidthWithoutText(3));
-}
-
 TEST_F(AutofillPopupControllerUnitTest, UpdateDataListValues) {
   std::vector<Suggestion> suggestions;
   suggestions.push_back(Suggestion("", "", "", 1));
   autofill_popup_controller_->Show(suggestions);
 
   // Add one data list entry.
   base::string16 value1 = ASCIIToUTF16("data list value 1");
   std::vector<base::string16> data_list_values;
   data_list_values.push_back(value1);
 
@@ skipping 139 matching lines @@
 
 #if !defined(OS_ANDROID)
 TEST_F(AutofillPopupControllerUnitTest, ElideText) {
   std::vector<Suggestion> suggestions;
   suggestions.push_back(
       Suggestion("Text that will need to be trimmed",
       "Label that will be trimmed", "genericCC", 0));
   suggestions.push_back(
       Suggestion("untrimmed", "Untrimmed", "genericCC", 0));
 
-  // Show the popup once so we can easily generate the size it needs.
-  autofill_popup_controller_->Show(suggestions);
+  autofill_popup_controller_->SetValues(suggestions);
 
   // Ensure the popup will be too small to display all of the first row.
   int popup_max_width =
       gfx::GetStringWidth(
           suggestions[0].value,
           autofill_popup_controller_->GetValueFontListForRow(0)) +
       gfx::GetStringWidth(
           suggestions[0].label,
           autofill_popup_controller_->GetLabelFontList()) - 25;
-  gfx::Rect popup_bounds = gfx::Rect(0, 0, popup_max_width, 0);
-  autofill_popup_controller_->set_display(gfx::Display(0, popup_bounds));
 
-  autofill_popup_controller_->Show(suggestions);
+  autofill_popup_controller_->ElideValueAndLabelForRow(0, popup_max_width);
 
   // The first element was long so it should have been trimmed.
   EXPECT_NE(autofill_popup_controller_->GetSuggestionAt(0).value,
             autofill_popup_controller_->GetElidedValueAt(0));
   EXPECT_NE(autofill_popup_controller_->GetSuggestionAt(0).label,
             autofill_popup_controller_->GetElidedLabelAt(0));
 
+  autofill_popup_controller_->ElideValueAndLabelForRow(1, popup_max_width);
+
   // The second element was shorter so it should be unchanged.
   EXPECT_EQ(autofill_popup_controller_->GetSuggestionAt(1).value,
             autofill_popup_controller_->GetElidedValueAt(1));
   EXPECT_EQ(autofill_popup_controller_->GetSuggestionAt(1).label,
             autofill_popup_controller_->GetElidedLabelAt(1));
 }
 #endif
 
 }  // namespace autofill