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

third_party/libaddressinput/chromium/cpp/src/address_ui.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 14 matching lines @@
 #include "grit.h"
 #include "messages.h"
 #include "region_data_constants.h"
 #include "rule.h"
 
 namespace i18n {
 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) {
   switch (field) {
     case COUNTRY:
       return IDS_LIBADDRESSINPUT_I18N_COUNTRY_LABEL;
     case ADMIN_AREA:
       return admin_area_name_message_id;
     case LOCALITY:
       return IDS_LIBADDRESSINPUT_I18N_LOCALITY_LABEL;
@@ skipping 24 matching lines @@
 const std::vector<std::string>& GetRegionCodes() {
   return RegionDataConstants::GetRegionCodes();
 }
 
 std::vector<AddressUiComponent> BuildComponents(
     const std::string& region_code,
     const Localization& localization) {
   std::vector<AddressUiComponent> result;
 
   Rule rule;
-  rule.CopyFrom(GetDefaultRule());
+  rule.CopyFrom(Rule::GetDefault());
   if (!rule.ParseSerializedRule(
            RegionDataConstants::GetRegionData(region_code))) {
     return result;
   }
 
   bool previous_field_is_newline = true;
   bool next_field_is_newline = true;
   for (std::vector<AddressField>::const_iterator field_it =
        rule.GetFormat().begin();
        field_it != rule.GetFormat().end(); ++field_it) {
@@ skipping 14 matching lines @@
         GetMessageIdForField(*field_it, rule.GetAdminAreaNameMessageId(),
                              rule.GetPostalCodeNameMessageId()));
     result.push_back(component);
   }
 
   return result;
 }
 
 }  // namespace addressinput
 }  // namespace i18n