Create an autofill Suggestion class

components/autofill/core/browser/personal_data_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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 2599 matching lines @@
 TEST_F(PersonalDataManagerTest, GetProfileSuggestions) {
   AutofillProfile profile(base::GenerateGUID(), "https://www.example.com");
   test::SetProfileInfo(&profile,
       "Marion", "Mitchell", "Morrison",
       "johnwayne@me.xyz", "Fox",
       "123 Zoo St.\nSecond Line\nThird line", "unit 5", "Hollywood", "CA",
       "91601", "US", "12345678910");
   personal_data_->AddProfile(profile);
   ResetPersonalDataManager(USER_MODE_NORMAL);
 
-  std::vector<base::string16> values;
-  std::vector<base::string16> labels;
-  std::vector<base::string16> icons;
-  std::vector<PersonalDataManager::GUIDPair> guid_pairs;
-  personal_data_->GetProfileSuggestions(
+  std::vector<Suggestion> suggestions = personal_data_->GetProfileSuggestions(
       AutofillType(ADDRESS_HOME_STREET_ADDRESS),
       base::UTF8ToUTF16("123"),
       false,
       std::vector<ServerFieldType>(),
-      base::Bind(ReturnTrue),
-      &values,
-      &labels,
-      &icons,
-      &guid_pairs);
-  ASSERT_FALSE(values.empty());
-  EXPECT_EQ(values[0],
+      base::Bind(ReturnTrue));
+  ASSERT_FALSE(suggestions.empty());
+  EXPECT_EQ(suggestions[0].value,
       base::UTF8ToUTF16("123 Zoo St., Second Line, Third line, unit 5"));
 }
 
 TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions) {
   // These GUIDs are reverse alphabetical to make validating expectations
   // easier.
   CreditCard credit_card0("287151C8-6AB1-487C-9095-28E80BE5DA15",
                           "https://www.example.com");
   test::SetCreditCardInfo(&credit_card0,
       "Clyde Barrow", "347666888555" /* American Express */, "04", "2015");
   personal_data_->AddCreditCard(credit_card0);
 
   CreditCard credit_card1("1141084B-72D7-4B73-90CF-3D6AC154673B",
                           "https://www.example.com");
   test::SetCreditCardInfo(&credit_card1, "John Dillinger", "", "01", "2010");
   personal_data_->AddCreditCard(credit_card1);
 
   CreditCard credit_card2("002149C1-EE28-4213-A3B9-DA243FFF021B",
                           "https://www.example.com");
   test::SetCreditCardInfo(&credit_card2,
       "Bonnie Parker", "518765432109" /* Mastercard */, "", "");
   personal_data_->AddCreditCard(credit_card2);
 
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   // Sublabel is card number when filling name.
-  std::vector<base::string16> values;
-  std::vector<base::string16> labels;
-  std::vector<base::string16> icons;
-  std::vector<PersonalDataManager::GUIDPair> guid_pairs;
-  personal_data_->GetCreditCardSuggestions(
-      AutofillType(CREDIT_CARD_NAME),
-      base::string16(),
-      &values,
-      &labels,
-      &icons,
-      &guid_pairs);
-  ASSERT_EQ(3U, values.size());
-  ASSERT_EQ(values.size(), labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Clyde Barrow"), values[2]);
-  EXPECT_EQ(ASCIIToUTF16("*8555"), labels[2]);
-  EXPECT_EQ(ASCIIToUTF16("John Dillinger"), values[1]);
-  EXPECT_EQ(base::string16(), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), values[0]);
-  EXPECT_EQ(ASCIIToUTF16("*2109"), labels[0]);
+  std::vector<Suggestion> suggestions =
+      personal_data_->GetCreditCardSuggestions(
+          AutofillType(CREDIT_CARD_NAME), base::string16());
+  ASSERT_EQ(3U, suggestions.size());
+  EXPECT_EQ(ASCIIToUTF16("Clyde Barrow"), suggestions[2].value);
+  EXPECT_EQ(ASCIIToUTF16("*8555"), suggestions[2].label);
+  EXPECT_EQ(ASCIIToUTF16("John Dillinger"), suggestions[1].value);
+  EXPECT_EQ(base::string16(), suggestions[1].label);
+  EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[0].value);
+  EXPECT_EQ(ASCIIToUTF16("*2109"), suggestions[0].label);
 
   // Sublabel is expiration date when filling card number.
-  values.clear();
-  labels.clear();
-  icons.clear();
-  guid_pairs.clear();
-  personal_data_->GetCreditCardSuggestions(
-      AutofillType(CREDIT_CARD_NUMBER),
-      base::string16(),
-      &values,
-      &labels,
-      &icons,
-      &guid_pairs);
-  ASSERT_EQ(2U, values.size());
-  ASSERT_EQ(values.size(), labels.size());
-  EXPECT_EQ(ASCIIToUTF16("********8555"), values[1]);
-  EXPECT_EQ(ASCIIToUTF16("04/15"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("********2109"), values[0]);
-  EXPECT_EQ(base::string16(), labels[0]);
+  suggestions = personal_data_->GetCreditCardSuggestions(
+      AutofillType(CREDIT_CARD_NUMBER), base::string16());
+  ASSERT_EQ(2U, suggestions.size());
+  EXPECT_EQ(ASCIIToUTF16("********8555"), suggestions[1].value);
+  EXPECT_EQ(ASCIIToUTF16("04/15"), suggestions[1].label);
+  EXPECT_EQ(ASCIIToUTF16("********2109"), suggestions[0].value);
+  EXPECT_EQ(base::string16(), suggestions[0].label);
 }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 TEST_F(PersonalDataManagerTest, ShowAddressBookPrompt) {
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged()).Times(2);
 
   AutofillType type(ADDRESS_HOME_STREET_ADDRESS);
 
   prefs_->SetBoolean(prefs::kAutofillEnabled, false);
   EXPECT_FALSE(personal_data_->ShouldShowAccessAddressBookSuggestion(type));
@@ skipping 29 matching lines @@
 
   prefs_->SetInteger(prefs::kAutofillMacAddressBookShowedCount, 4);
   EXPECT_TRUE(personal_data_->ShouldShowAccessAddressBookSuggestion(type));
 
   prefs_->SetInteger(prefs::kAutofillMacAddressBookShowedCount, 6);
   EXPECT_FALSE(personal_data_->ShouldShowAccessAddressBookSuggestion(type));
 }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 }  // namespace autofill