[rac] Download all rules for a country code in libaddressinput.

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 2867dae27137a26bc27749c3af025bc5fe7a1881..4dd18776a542cb2b86aa5988484a541fc64909ff 100644
--- a/third_party/libaddressinput/chromium/cpp/src/address_ui.cc
+++ b/third_party/libaddressinput/chromium/cpp/src/address_ui.cc
@@ -32,24 +32,6 @@ namespace addressinput {
 
 namespace {
 
-// Parses the default region data into the static Rule object and returns a
-// constant reference to this object. Cannot return a copy of the object,
-// because Rule objects are not copyable.
-const Rule& InitDefaultRule() {
-  static Rule rule;
-  rule.ParseSerializedRule(RegionDataConstants::GetDefaultRegionData());
-  return rule;

[please use gerrit instead, 2013/12/16 23:41:38]

(This code is moved into Rule.cc.)

You mentioned in a different code review that we should not have static
non-PODs. However, this code is full of static data. Take
region_data_constants.cc for example:

http://src.chromium.org/viewvc/chrome/trunk/src/third_party/libaddressinput/c...
(line 994).


It has a static std::map<std::string, std::string> object.

-}
-
-// Returns the constant reference to the Rule object from InitDefaultRule(). The
-// static object is in InitDefaultRule(), but this function maintains a constant
-// static reference to it. The constant static reference avoids re-parsing the
-// default region data.
-const Rule& GetDefaultRule() {
-  static const Rule& kDefaultRule(InitDefaultRule());
-  return kDefaultRule;
-}
-
 int GetMessageIdForField(AddressField field,
                          int admin_area_name_message_id,
                          int postal_code_name_message_id) {
@@ -94,7 +76,7 @@ std::vector<AddressUiComponent> BuildComponents(
   std::vector<AddressUiComponent> result;
 
   Rule rule;
-  rule.CopyFrom(GetDefaultRule());
+  rule.CopyFrom(Rule::GetDefault());
   if (!rule.ParseSerializedRule(
            RegionDataConstants::GetRegionData(region_code))) {
     return result;