Create an autofill Suggestion class

components/autofill/core/browser/autocomplete_history_manager_unittest.cc

Index: components/autofill/core/browser/autocomplete_history_manager_unittest.cc
diff --git a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
index af42bef469afe214777a45f0fe065060702fd8ab..370512dffa795fb0be5454355143fa3ab5363e2d 100644
--- a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
@@ -196,12 +196,9 @@ class MockAutofillExternalDelegate : public AutofillExternalDelegate {
       : 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);
@@ -215,6 +212,11 @@ class TestAutocompleteHistoryManager : public AutocompleteHistoryManager {
   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.
@@ -233,7 +235,7 @@ TEST_F(AutocompleteHistoryManagerTest, ExternalDelegate) {
   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);
 }
 
@@ -263,19 +265,13 @@ TEST_F(AutocompleteHistoryManagerTest, NoAutocompleteSuggestionsForTextarea) {
 
   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