AutofillPopupController clarifications + simplifications.

chrome/browser/autofill/autofill_external_delegate_unittest.cc

Index: chrome/browser/autofill/autofill_external_delegate_unittest.cc
diff --git a/chrome/browser/autofill/autofill_external_delegate_unittest.cc b/chrome/browser/autofill/autofill_external_delegate_unittest.cc
index 7cafa7383fd80a30b50b76c73444c48e1caaef2f..7dbb96881da9123c909024445d59831499bfd8cd 100644
--- a/chrome/browser/autofill/autofill_external_delegate_unittest.cc
+++ b/chrome/browser/autofill/autofill_external_delegate_unittest.cc
@@ -41,10 +41,10 @@ class MockAutofillExternalDelegate :
   ~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());
 
@@ -157,7 +157,7 @@ TEST_F(AutofillExternalDelegateUnitTest, TestExternalDelegateVirtualCalls) {
   // 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);
+                                                  autofill_ids[0]);
 }
 
 // Test that data list elements for a node will appear in the Autofill popup.
@@ -225,7 +225,7 @@ TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateInvalidUniqueId) {
 
   // 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_->DidAcceptAutofillSuggestion(string16(), -1);
 }
 
 // Test that the ClearPreview IPC is only sent the form was being previewed
@@ -290,6 +290,5 @@ TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegatePasswordSuggestions) {
   // we've selected an option.
   external_delegate_->DidAcceptAutofillSuggestion(
       suggestions[0],
-      WebAutofillClient::MenuItemIDPasswordEntry,
-      0);
+      WebAutofillClient::MenuItemIDPasswordEntry);
 }