Update libaddressinput's US address format

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

 // Copyright (C) 2013 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 1067 matching lines @@
   region_data.insert(std::make_pair("TZ", "{"
       "\"name\":\"TANZANIA (UNITED REP.)\""
       "}"));
   region_data.insert(std::make_pair("UA", "{"
       "\"name\":\"UKRAINE\","
       "\"fmt\":\"%Z %C%n%A%n%O%n%N\""
       "}"));
   region_data.insert(std::make_pair("UG", "{"
       "\"name\":\"UGANDA\""
       "}"));
+  // NOTE: The fmt value for UM and US differs from the i18napis fmt by the
+  // insertion of a comma separating city and state.
   region_data.insert(std::make_pair("UM", "{"
       "\"name\":\"UNITED STATES MINOR OUTLYING ISLANDS\","
-      "\"fmt\":\"%N%n%O%n%A%n%C %S %Z\","
+      "\"fmt\":\"%N%n%O%n%A%n%C, %S %Z\","
       "\"zip_name_type\":\"zip\","
       "\"state_name_type\":\"state\""
       "}"));
   region_data.insert(std::make_pair("US", "{"
       "\"name\":\"UNITED STATES\","
       "\"lang\":\"en\","
       "\"languages\":\"en\","
-      "\"fmt\":\"%N%n%O%n%A%n%C %S %Z\","
+      "\"fmt\":\"%N%n%O%n%A%n%C, %S %Z\","
       "\"zip_name_type\":\"zip\","
       "\"state_name_type\":\"state\""
       "}"));
   region_data.insert(std::make_pair("UY", "{"
       "\"name\":\"URUGUAY\","
       "\"lang\":\"es\","
       "\"languages\":\"es\","
       "\"fmt\":\"%N%n%O%n%A%n%Z %C %S\""
       "}"));
   region_data.insert(std::make_pair("UZ", "{"
@@ skipping 117 matching lines @@
 }
 
 // static
 const std::string& RegionDataConstants::GetCountryCompactLineSeparator(
     const std::string& country_code) {
   return GetCompactLineSeparator(GetCountryScript(country_code));
 }
 
 }  // namespace addressinput
 }  // namespace i18n