AutofillPopupController clarifications + simplifications.

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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/gfx/rect.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using WebKit::WebAutofillClient;
 
 namespace {
 
 class MockAutofillExternalDelegate :
       public autofill::TestAutofillExternalDelegate {
  public:
   MockAutofillExternalDelegate() : TestAutofillExternalDelegate(NULL, NULL) {};
   virtual ~MockAutofillExternalDelegate() {};
 
-  virtual void SelectAutofillSuggestion(int unique_id)
-      OVERRIDE {}
-  virtual void RemoveAutocompleteEntry(const string16& value) OVERRIDE {}
-  virtual void RemoveAutofillProfileOrCreditCard(int unique_id) OVERRIDE {}
+  virtual void DidSelectSuggestion(int identifier) OVERRIDE {}
+  virtual void RemoveSuggestion(const string16& value, int identifier) OVERRIDE
+      {}
   virtual void ClearPreviewedForm() OVERRIDE {}
 
   MOCK_METHOD0(ControllerDestroyed, void());
 };
 
 class TestAutofillPopupController : public AutofillPopupControllerImpl {
  public:
   explicit TestAutofillPopupController(
       AutofillExternalDelegate* external_delegate)
       : AutofillPopupControllerImpl(external_delegate, NULL, gfx::Rect()) {}
   virtual ~TestAutofillPopupController() {}
 
   // Making protected functions public for testing
-  const std::vector<string16>& autofill_values() const {
-    return AutofillPopupControllerImpl::autofill_values();
+  const std::vector<string16>& subtexts() const {
+    return AutofillPopupControllerImpl::subtexts();
   }
   int selected_line() const {
     return AutofillPopupControllerImpl::selected_line();
   }
   void SetSelectedLine(size_t selected_line) {
     AutofillPopupControllerImpl::SetSelectedLine(selected_line);
   }
   void SelectNextLine() {
     AutofillPopupControllerImpl::SelectNextLine();
   }
@@ skipping 46 matching lines @@
   EXPECT_CALL(*autofill_popup_controller_,
               UpdateBoundsAndRedrawPopup());
 
   popup_controller()->SetPopupBounds(popup_bounds);
 
   EXPECT_EQ(popup_bounds, popup_controller()->popup_bounds());
 }
 
 TEST_F(AutofillPopupControllerUnitTest, ChangeSelectedLine) {
   // Set up the popup.
-  std::vector<string16> autofill_values(2, string16());
+  std::vector<string16> names(2, string16());
   std::vector<int> autofill_ids(2, 0);
-  autofill_popup_controller_->Show(
-      autofill_values, autofill_values, autofill_values, autofill_ids);
+  autofill_popup_controller_->Show(names, names, names, autofill_ids);
 
   EXPECT_LT(autofill_popup_controller_->selected_line(), 0);
   // Check that there are at least 2 values so that the first and last selection
   // are different.
   EXPECT_GE(2,
-      static_cast<int>(autofill_popup_controller_->autofill_values().size()));
+      static_cast<int>(autofill_popup_controller_->subtexts().size()));
 
   // Test wrapping before the front.
   autofill_popup_controller_->SelectPreviousLine();
   EXPECT_EQ(static_cast<int>(
-      autofill_popup_controller_->autofill_values().size() - 1),
+      autofill_popup_controller_->subtexts().size() - 1),
       autofill_popup_controller_->selected_line());
 
   // Test wrapping after the end.
   autofill_popup_controller_->SelectNextLine();
   EXPECT_EQ(0, autofill_popup_controller_->selected_line());
 }
 
 TEST_F(AutofillPopupControllerUnitTest, RedrawSelectedLine) {
   // Set up the popup.
-  std::vector<string16> autofill_values(2, string16());
+  std::vector<string16> names(2, string16());
   std::vector<int> autofill_ids(2, 0);
-  autofill_popup_controller_->Show(
-      autofill_values, autofill_values, autofill_values,
-      autofill_ids);
+  autofill_popup_controller_->Show(names, names, names, autofill_ids);
 
   // Make sure that when a new line is selected, it is invalidated so it can
   // be updated to show it is selected.
   int selected_line = 0;
   EXPECT_CALL(*autofill_popup_controller_, InvalidateRow(selected_line));
   autofill_popup_controller_->SetSelectedLine(selected_line);
 
   // Ensure that the row isn't invalidated if it didn't change.
   EXPECT_CALL(*autofill_popup_controller_,
               InvalidateRow(selected_line)).Times(0);
   autofill_popup_controller_->SetSelectedLine(selected_line);
 
   // Change back to no selection.
   EXPECT_CALL(*autofill_popup_controller_, InvalidateRow(selected_line));
   autofill_popup_controller_->SetSelectedLine(-1);
 }
 
 TEST_F(AutofillPopupControllerUnitTest, RemoveLine) {
   // Set up the popup.
-  std::vector<string16> autofill_values(3, string16());
+  std::vector<string16> names(3, string16());
   std::vector<int> autofill_ids;
   autofill_ids.push_back(1);
   autofill_ids.push_back(1);
   autofill_ids.push_back(WebAutofillClient::MenuItemIDAutofillOptions);
-  autofill_popup_controller_->Show(
-      autofill_values, autofill_values, autofill_values, autofill_ids);
+  autofill_popup_controller_->Show(names, names, names, autofill_ids);
 
   // Generate a popup, so it can be hidden later. It doesn't matter what the
   // external_delegate thinks is being shown in the process, since we are just
   // testing the popup here.
   autofill::GenerateTestAutofillPopup(&external_delegate_);
 
   // No line is selected so the removal should fail.
   EXPECT_FALSE(autofill_popup_controller_->RemoveSelectedLine());
 
   // Try to remove the last entry and ensure it fails (it is an option).
   autofill_popup_controller_->SetSelectedLine(
-      autofill_popup_controller_->autofill_values().size() - 1);
+      autofill_popup_controller_->subtexts().size() - 1);
   EXPECT_FALSE(autofill_popup_controller_->RemoveSelectedLine());
   EXPECT_LE(0, autofill_popup_controller_->selected_line());
 
   // Remove the first entry. The popup should be redrawn since its size has
   // changed.
   EXPECT_CALL(*autofill_popup_controller_, UpdateBoundsAndRedrawPopup());
   autofill_popup_controller_->SetSelectedLine(0);
   EXPECT_TRUE(autofill_popup_controller_->RemoveSelectedLine());
 
   // Remove the last entry. The popup should then be hidden since there are
   // no Autofill entries left.
   EXPECT_CALL(external_delegate_, ControllerDestroyed());
 
   autofill_popup_controller_->SetSelectedLine(0);
   // The controller self-deletes here, don't double delete.
   EXPECT_TRUE(autofill_popup_controller_->RemoveSelectedLine());
   autofill_popup_controller_ = NULL;
 }
 
 TEST_F(AutofillPopupControllerUnitTest, SkipSeparator) {
   // Set up the popup.
-  std::vector<string16> autofill_values(3, string16());
+  std::vector<string16> names(3, string16());
   std::vector<int> autofill_ids;
   autofill_ids.push_back(1);
   autofill_ids.push_back(WebAutofillClient::MenuItemIDSeparator);
   autofill_ids.push_back(WebAutofillClient::MenuItemIDAutofillOptions);
-  autofill_popup_controller_->Show(
-      autofill_values, autofill_values, autofill_values, autofill_ids);
+  autofill_popup_controller_->Show(names, names, names, autofill_ids);
 
   autofill_popup_controller_->SetSelectedLine(0);
 
   // 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());
@@ skipping 42 matching lines @@
           NULL,
           bounds);
   EXPECT_EQ(
       bounds,
       static_cast<AutofillPopupController*>(controller3)->element_bounds());
   controller3->Hide();
 
   EXPECT_CALL(delegate, ControllerDestroyed());
   delete test_controller;
 }