Update Autofill Private API to provide a list of available countries.

chrome/browser/extensions/api/autofill_private/autofill_util.cc

 // Copyright 2015 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 "chrome/browser/extensions/api/autofill_private/autofill_util.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/autofill/country_combobox_model.h"
 #include "chrome/common/extensions/api/autofill_private.h"
 #include "chrome/common/pref_names.h"
+#include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/prefs/pref_service.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill_private = extensions::api::autofill_private;
 
@@ skipping 79 matching lines @@
   metadata->summary_label = base::UTF16ToUTF8(label_pieces[0]);
   metadata->summary_sublabel.reset(new std::string(base::UTF16ToUTF8(
       label.substr(label_pieces[0].size()))));
   metadata->is_local.reset(new bool(
       profile.record_type() == autofill::AutofillProfile::LOCAL_PROFILE));
   address.metadata = std::move(metadata);
 
   return address;
 }
 
+autofill_private::CountryEntry CountryToCountryEntry(
+    autofill::AutofillCountry* country) {
+  autofill_private::CountryEntry entry;
+
+  // A null |country| means "insert a space here", so we add a country w/o a
+  // |name| or |country_code| to the list and let the UI handle it.
+  if (country) {
+    entry.name.reset(new std::string(base::UTF16ToUTF8(country->name())));
+    entry.country_code.reset(new std::string(country->country_code()));
+  }
+
+  return entry;
+}
+
 autofill_private::CreditCardEntry CreditCardToCreditCardEntry(
     const autofill::CreditCard& credit_card) {
   autofill_private::CreditCardEntry card;
 
   // Add all credit card fields to the entry.
   card.guid.reset(new std::string(credit_card.guid()));
   card.name.reset(new std::string(base::UTF16ToUTF8(
       credit_card.GetRawInfo(autofill::CREDIT_CARD_NAME_FULL))));
   card.card_number.reset(new std::string(
       base::UTF16ToUTF8(credit_card.GetRawInfo(autofill::CREDIT_CARD_NUMBER))));
@@ skipping 36 matching lines @@
       &labels);
   DCHECK_EQ(labels.size(), profiles.size());
 
   AddressEntryList list;
   for (size_t i = 0; i < profiles.size(); ++i)
     list.push_back(ProfileToAddressEntry(*profiles[i], labels[i]));
 
   return list;
 }
 
+CountryEntryList GenerateCountryList(
+    const autofill::PersonalDataManager& personal_data) {
+  autofill::CountryComboboxModel model;
+  model.SetCountries(personal_data, base::Callback<bool(const std::string&)>());
+  const std::vector<autofill::AutofillCountry*>& countries = model.countries();
+
+  CountryEntryList list;
+
+  for (size_t i = 0; i < countries.size(); ++i)
+    list.push_back(CountryToCountryEntry(countries[i]));
+
+  return list;
+}
+
 CreditCardEntryList GenerateCreditCardList(
     const autofill::PersonalDataManager& personal_data) {
   const std::vector<autofill::CreditCard*>& cards =
       personal_data.GetCreditCards();
 
   CreditCardEntryList list;
   for (const autofill::CreditCard* card : cards)
     list.push_back(CreditCardToCreditCardEntry(*card));
 
   return list;
 }
 
 }  // namespace autofill_util
 
 }  // namespace extensions