AutofillPopupController clarifications + simplifications.

chrome/browser/autofill/autofill_external_delegate_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 <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_manager.h"
@@ skipping 23 matching lines @@
 
 class MockAutofillExternalDelegate :
       public autofill::TestAutofillExternalDelegate {
  public:
   MockAutofillExternalDelegate(content::WebContents* web_contents,
                                AutofillManager* autofill_manger)
       : TestAutofillExternalDelegate(web_contents, autofill_manger) {}
   ~MockAutofillExternalDelegate() {}
 
   MOCK_METHOD4(ApplyAutofillSuggestions, void(
-      const std::vector<string16>& autofill_values,
-      const std::vector<string16>& autofill_labels,
-      const std::vector<string16>& autofill_icons,
-      const std::vector<int>& autofill_unique_ids));
+      const std::vector<string16>& labels,
+      const std::vector<string16>& sub_labels,
+      const std::vector<string16>& icons,
+      const std::vector<int>& identifiers));
 
   MOCK_METHOD0(ClearPreviewedForm, void());
 
   MOCK_METHOD1(EnsurePopupForElement, void(const gfx::Rect& element_bounds));
 
   MOCK_METHOD0(HideAutofillPopup, void());
 };
 
 class MockAutofillManager : public AutofillManager {
  public:
@@ skipping 91 matching lines @@
                                             autofill_item,
                                             autofill_ids);
 
   // Called by DidAutofillSuggestions, add expectation to remove warning.
   EXPECT_CALL(*autofill_manager_, OnFillAutofillFormData(_, _, _, _));
 
   EXPECT_CALL(*external_delegate_, HideAutofillPopup());
 
   // This should trigger a call to hide the popup since
   // we've selected an option.
-  external_delegate_->DidAcceptAutofillSuggestion(autofill_item[0],
-                                                  autofill_ids[0], 0);
+  external_delegate_->DidAcceptSuggestion(autofill_item[0], autofill_ids[0]);
 }
 
 // Test that data list elements for a node will appear in the Autofill popup.
 TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateDataList) {
   IssueOnQuery(kQueryId);
 
   std::vector<string16> data_list_items;
   data_list_items.push_back(string16());
   std::vector<int> data_list_ids;
   data_list_ids.push_back(WebAutofillClient::MenuItemIDDataListEntry);
@@ skipping 43 matching lines @@
                                             autofill_item,
                                             autofill_ids);
 }
 
 // Test that the Autofill delegate doesn't try and fill a form with a
 // negative unique id.
 TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateInvalidUniqueId) {
   // Ensure it doesn't try to preview the negative id.
   EXPECT_CALL(*autofill_manager_, OnFillAutofillFormData(_, _, _, _)).Times(0);
   EXPECT_CALL(*external_delegate_, ClearPreviewedForm()).Times(1);
-  external_delegate_->SelectAutofillSuggestion(-1);
+  external_delegate_->DidSelectSuggestion(-1);
 
   // Ensure it doesn't try to fill the form in with the negative id.
   EXPECT_CALL(*autofill_manager_, OnFillAutofillFormData(_, _, _, _)).Times(0);
-  external_delegate_->DidAcceptAutofillSuggestion(string16(), -1, 0);
+  external_delegate_->DidAcceptSuggestion(string16(), -1);
 }
 
 // Test that the ClearPreview IPC is only sent the form was being previewed
 // (i.e. it isn't autofilling a password).
 TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateClearPreviewedForm) {
-  // Called by SelectAutofillSuggestion, add expectation to remove
+  // Called by DidSelectSuggestion, add expectation to remove
   // warning.
   EXPECT_CALL(*autofill_manager_, OnFillAutofillFormData(_, _, _, _));
 
   // Ensure selecting a new password entries or Autofill entries will
   // cause any previews to get cleared.
   EXPECT_CALL(*external_delegate_, ClearPreviewedForm()).Times(1);
-  external_delegate_->SelectAutofillSuggestion(
+  external_delegate_->DidSelectSuggestion(
       WebAutofillClient::MenuItemIDPasswordEntry);
 
   EXPECT_CALL(*external_delegate_, ClearPreviewedForm()).Times(1);
-  external_delegate_->SelectAutofillSuggestion(1);
+  external_delegate_->DidSelectSuggestion(1);
 }
 
 // Test that the popup is hidden once we are done editing the autofill field.
 TEST_F(AutofillExternalDelegateUnitTest,
        ExternalDelegateHidePopupAfterEditing) {
   EXPECT_CALL(*external_delegate_, EnsurePopupForElement(_));
   EXPECT_CALL(*external_delegate_, ApplyAutofillSuggestions(_, _, _, _));
 
   autofill::GenerateTestAutofillPopup(external_delegate_.get());
 
@@ skipping 25 matching lines @@
                                                 field,
                                                 element_bounds);
 
   // Called by DidAutofillSuggestions, add expectation to remove warning.
   EXPECT_CALL(*autofill_manager_, OnFillAutofillFormData(_, _, _, _));
 
   EXPECT_CALL(*external_delegate_, HideAutofillPopup());
 
   // This should trigger a call to hide the popup since
   // we've selected an option.
-  external_delegate_->DidAcceptAutofillSuggestion(
+  external_delegate_->DidAcceptSuggestion(
       suggestions[0],
-      WebAutofillClient::MenuItemIDPasswordEntry,
-      0);
+      WebAutofillClient::MenuItemIDPasswordEntry);
 }