Create an autofill Suggestion class

components/autofill/core/browser/autocomplete_history_manager_unittest.cc

 // Copyright 2013 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/memory/ref_counted.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
@@ skipping 178 matching lines @@
 
 namespace {
 
 class MockAutofillExternalDelegate : public AutofillExternalDelegate {
  public:
   MockAutofillExternalDelegate(AutofillManager* autofill_manager,
                                AutofillDriver* autofill_driver)
       : AutofillExternalDelegate(autofill_manager, autofill_driver) {}
   virtual ~MockAutofillExternalDelegate() {}
 
-  MOCK_METHOD5(OnSuggestionsReturned,
+  MOCK_METHOD2(OnSuggestionsReturned,
                void(int query_id,
-                    const std::vector<base::string16>& autofill_values,
-                    const std::vector<base::string16>& autofill_labels,
-                    const std::vector<base::string16>& autofill_icons,
-                    const std::vector<int>& autofill_unique_ids));
+                    const std::vector<Suggestion>& suggestions));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillExternalDelegate);
 };
 
 class TestAutocompleteHistoryManager : public AutocompleteHistoryManager {
  public:
   TestAutocompleteHistoryManager(AutofillDriver* driver, AutofillClient* client)
       : AutocompleteHistoryManager(driver, client) {}
 
   using AutocompleteHistoryManager::SendSuggestions;
 };
 
+// Predicate for GMock.
+bool IsEmptySuggestionVector(const std::vector<Suggestion>& suggestions) {
+  return suggestions.empty();
+}
+
 }  // namespace
 
 // Make sure our external delegate is called at the right time.
 TEST_F(AutocompleteHistoryManagerTest, ExternalDelegate) {
   TestAutocompleteHistoryManager autocomplete_history_manager(
       autofill_driver_.get(), autofill_client_.get());
 
   scoped_ptr<AutofillManager> autofill_manager(
       new AutofillManager(autofill_driver_.get(),
                           autofill_client_.get(),
                           "en-US",
                           AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER));
 
   MockAutofillExternalDelegate external_delegate(autofill_manager.get(),
                                                  autofill_driver_.get());
   autocomplete_history_manager.SetExternalDelegate(&external_delegate);
 
   // Should trigger a call to OnSuggestionsReturned, verified by the mock.
-  EXPECT_CALL(external_delegate, OnSuggestionsReturned(_, _, _, _, _));
+  EXPECT_CALL(external_delegate, OnSuggestionsReturned(_, _));
   autocomplete_history_manager.SendSuggestions(NULL);
 }
 
 // Verify that no autocomplete suggestion is returned for textarea.
 TEST_F(AutocompleteHistoryManagerTest, NoAutocompleteSuggestionsForTextarea) {
   TestAutocompleteHistoryManager autocomplete_history_manager(
       autofill_driver_.get(), autofill_client_.get());
 
   scoped_ptr<AutofillManager> autofill_manager(
       new AutofillManager(autofill_driver_.get(),
                           autofill_client_.get(),
                           "en-US",
                           AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER));
 
   MockAutofillExternalDelegate external_delegate(autofill_manager.get(),
                                                  autofill_driver_.get());
   autocomplete_history_manager.SetExternalDelegate(&external_delegate);
 
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
   form.user_submitted = true;
 
   FormFieldData field;
   test::CreateTestFormField("Address", "address", "", "textarea", &field);
 
   EXPECT_CALL(external_delegate,
               OnSuggestionsReturned(0,
-                                    std::vector<base::string16>(),
-                                    std::vector<base::string16>(),
-                                    std::vector<base::string16>(),
-                                    std::vector<int>()));
+                                    testing::Truly(IsEmptySuggestionVector)));
   autocomplete_history_manager.OnGetAutocompleteSuggestions(
       0,
       field.name,
       field.value,
       field.form_control_type,
-      std::vector<base::string16>(),
-      std::vector<base::string16>(),
-      std::vector<base::string16>(),
-      std::vector<int>());
+      std::vector<Suggestion>());
 }
 
 }  // namespace autofill