libaddressinput string translations

third_party/libaddressinput/chromium/cpp/src/address_ui.cc

Index: third_party/libaddressinput/chromium/cpp/src/address_ui.cc
diff --git a/third_party/libaddressinput/chromium/cpp/src/address_ui.cc b/third_party/libaddressinput/chromium/cpp/src/address_ui.cc
index cf57543bb743e2e9012f72e2bad16732dd799083..d833a08a9cf56ab5d54131a6f1920714ae0c8139 100644
--- a/third_party/libaddressinput/chromium/cpp/src/address_ui.cc
+++ b/third_party/libaddressinput/chromium/cpp/src/address_ui.cc
@@ -16,13 +16,12 @@
 
 #include <libaddressinput/address_field.h>
 #include <libaddressinput/address_ui_component.h>
-#include <libaddressinput/localization.h>
 
 #include <string>
 #include <vector>
 
 #include "grit.h"
-#include "messages.h"
+#include "grit/libaddressinput_strings.h"
 #include "region_data_constants.h"
 #include "rule.h"
 
@@ -65,8 +64,7 @@ const std::vector<std::string>& GetRegionCodes() {
 }
 
 std::vector<AddressUiComponent> BuildComponents(
-    const std::string& region_code,
-    const Localization& localization) {
+    const std::string& region_code) {
   std::vector<AddressUiComponent> result;
 
   Rule rule;
@@ -87,9 +85,10 @@ std::vector<AddressUiComponent> BuildComponents(
           line_it->size() == 1 ? AddressUiComponent::HINT_LONG
                                : AddressUiComponent::HINT_SHORT;
       component.field = *field_it;
-      component.name = localization.GetString(
-          GetMessageIdForField(*field_it, rule.GetAdminAreaNameMessageId(),
-                              rule.GetPostalCodeNameMessageId()));
+      component.name_id =
+          GetMessageIdForField(*field_it,
+                               rule.GetAdminAreaNameMessageId(),
+                               rule.GetPostalCodeNameMessageId());
       result.push_back(component);
     }
   }