Reland "Use upstream libaddressinput in Chrome."

chrome/browser/ui/autofill/autofill_dialog_i18n_input.cc

 // Copyright 2014 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/ui/autofill/autofill_dialog_i18n_input.h"
 
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "components/autofill/core/browser/address_i18n.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "grit/components_strings.h"
 #include "third_party/libaddressinput/chromium/addressinput_util.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_field.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui_component.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui_component.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/localization.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 namespace i18ninput {
 
 namespace {
 
 using base::UTF16ToUTF8;
-using ::i18n::addressinput::AddressData;
 using ::i18n::addressinput::AddressField;
 using ::i18n::addressinput::AddressUiComponent;
+using ::i18n::addressinput::Localization;
+
+std::vector<AddressUiComponent> BuildComponents(const std::string& country_code,
+                                                std::string* language_code) {
+  Localization localization;
+  localization.SetGetter(l10n_util::GetStringUTF8);
+  std::string not_used;
+  return ::i18n::addressinput::BuildComponents(
+      country_code, localization, g_browser_process->GetApplicationLocale(),
+      language_code == NULL ? &not_used : language_code);
+}
 
 DetailInput::Length LengthFromHint(AddressUiComponent::LengthHint hint) {
   if (hint == AddressUiComponent::HINT_SHORT)
     return DetailInput::SHORT;
   DCHECK_EQ(hint, AddressUiComponent::HINT_LONG);
   return DetailInput::LONG;
 }
 
 }  // namespace
 
 void BuildAddressInputs(common::AddressType address_type,
                         const std::string& country_code,
                         DetailInputs* inputs,
                         std::string* language_code) {
-  std::vector<AddressUiComponent> components(
-      ::i18n::addressinput::BuildComponents(
-          country_code, g_browser_process->GetApplicationLocale(),
-          language_code));
+  const std::vector<AddressUiComponent>& components(
+      BuildComponents(country_code, language_code));
 
   const bool billing = address_type == common::ADDRESS_TYPE_BILLING;
 
   for (size_t i = 0; i < components.size(); ++i) {
     const AddressUiComponent& component = components[i];
     ServerFieldType server_type = TypeForField(component.field, address_type);
     DetailInput::Length length = LengthFromHint(component.length_hint);
-    base::string16 placeholder = l10n_util::GetStringUTF16(component.name_id);
+    base::string16 placeholder = base::UTF8ToUTF16(component.name);
     DetailInput input = { length, server_type, placeholder };
     inputs->push_back(input);
   }
 
   ServerFieldType server_type =
       billing ? ADDRESS_BILLING_COUNTRY : ADDRESS_HOME_COUNTRY;
   base::string16 placeholder_text =
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_COUNTRY);
   DetailInput input = { DetailInput::LONG, server_type, placeholder_text };
   inputs->push_back(input);
@@ skipping 62 matching lines @@
     case ::i18n::addressinput::STREET_ADDRESS:
       return billing ? ADDRESS_BILLING_STREET_ADDRESS :
                        ADDRESS_HOME_STREET_ADDRESS;
     case ::i18n::addressinput::RECIPIENT:
       return billing ? NAME_BILLING_FULL : NAME_FULL;
   }
   NOTREACHED();
   return UNKNOWN_TYPE;
 }
 
-bool FieldForType(ServerFieldType server_type,
-                  ::i18n::addressinput::AddressField* field) {
+bool FieldForType(ServerFieldType server_type, AddressField* field) {
   switch (server_type) {
     case ADDRESS_BILLING_COUNTRY:
     case ADDRESS_HOME_COUNTRY:
       if (field)
         *field = ::i18n::addressinput::COUNTRY;
       return true;
     case ADDRESS_BILLING_STATE:
     case ADDRESS_HOME_STATE:
       if (field)
         *field = ::i18n::addressinput::ADMIN_AREA;
@@ skipping 32 matching lines @@
       if (field)
         *field = ::i18n::addressinput::RECIPIENT;
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace i18ninput
 }  // namespace autofill