Add Delete Support to New Autofill UI

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 16 matching lines @@
 
 namespace {
 
 class MockAutofillExternalDelegate : public TestAutofillExternalDelegate {
  public:
   MockAutofillExternalDelegate(TabContentsWrapper* wrapper,
                                AutofillManager* autofill_manger)
       : TestAutofillExternalDelegate(wrapper, autofill_manger) {}
   ~MockAutofillExternalDelegate() {}
 
-  MOCK_METHOD5(ApplyAutofillSuggestions, void(
+  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,
-      int separator_index));
+      const std::vector<int>& autofill_unique_ids));
 
   MOCK_METHOD4(OnQueryPlatformSpecific,
                void(int query_id,
                     const webkit::forms::FormData& form,
                     const webkit::forms::FormField& field,
                     const gfx::Rect& bounds));
 
   MOCK_METHOD0(ClearPreviewedForm, void());
 
   MOCK_METHOD0(HideAutofillPopup, void());
@@ skipping 51 matching lines @@
   field.is_focusable = true;
   field.should_autocomplete = true;
   const gfx::Rect bounds;
 
   EXPECT_CALL(*external_delegate_,
               OnQueryPlatformSpecific(kQueryId, form, field, bounds));
 
   // This should call OnQueryPlatform specific.
   external_delegate_->OnQuery(kQueryId, form, field, bounds, false);
 
-  EXPECT_CALL(*external_delegate_, ApplyAutofillSuggestions(_, _, _, _, _));
+  EXPECT_CALL(*external_delegate_, ApplyAutofillSuggestions(_, _, _, _));
 
   // This should call ApplyAutofillSuggestions.
   std::vector<string16> autofill_item;
   autofill_item.push_back(string16());
   std::vector<int> autofill_ids;
   autofill_ids.push_back(1);
   external_delegate_->OnSuggestionsReturned(kQueryId,
                                             autofill_item,
                                             autofill_item,
                                             autofill_item,
                                             autofill_ids);
 
 
   EXPECT_CALL(*external_delegate_, HideAutofillPopup());
 
   // Called by DidAutofillSuggestions, add expectation to remove warning.
   EXPECT_CALL(*autofill_manager_, OnFillAutofillFormData(_, _, _, _));
 
   // This should trigger a call to hide the popup since
   // we've selected an option.
   external_delegate_->DidAcceptAutofillSuggestions(autofill_item[0],
                                                    autofill_ids[0], 0);
 }
 
 // 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);
-  external_delegate_->SelectAutofillSuggestionAtIndex(-1, 0);
+  external_delegate_->SelectAutofillSuggestionAtIndex(-1);
 
   // Ensure it doesn't try to fill the form in with the negative id.
   EXPECT_CALL(*autofill_manager_, OnFillAutofillFormData(_, _, _, _)).Times(0);
   external_delegate_->DidAcceptAutofillSuggestions(string16(), -1, 0);
 }
 
 // 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 SelectAutofillSuggestionAtIndex, 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_->SelectAutofillSuggestionAtIndex(
-      WebAutofillClient::MenuItemIDPasswordEntry,
-      0);
+      WebAutofillClient::MenuItemIDPasswordEntry);
 
   EXPECT_CALL(*external_delegate_, ClearPreviewedForm()).Times(1);
-  external_delegate_->SelectAutofillSuggestionAtIndex(1, 0);
+  external_delegate_->SelectAutofillSuggestionAtIndex(1);
 }