Reland of "Use address_data.h from upstream libaddressinput".

third_party/libaddressinput/chromium/cpp/test/countryinfo_example_addresses_test.cc

 // Copyright (C) 2014 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 84 matching lines @@
         "fields", &fields_json));
 
     AddressData address;
     for (int i = 1; i < 10; ++i) {
       std::string street_key = "street";
       street_key.append(1, static_cast<char>('0' + i));
       std::string street_field;
       if (!fields_json->GetStringValueForKey(street_key, &street_field))
         break;
 
-      address.address_lines.push_back(street_field);
+      address.address_line.push_back(street_field);
     }
-    address.country_code = country;
+    address.region_code = country;
     fields_json->GetStringValueForKey("state", &address.administrative_area);
     fields_json->GetStringValueForKey("city", &address.locality);
     fields_json->GetStringValueForKey("locality", &address.dependent_locality);
     fields_json->GetStringValueForKey("sorting_code", &address.sorting_code);
     fields_json->GetStringValueForKey("zip", &address.postal_code);
     fields_json->GetStringValueForKey("name", &address.recipient);
 
     AddressProblems problems;
     EXPECT_EQ(AddressValidator::SUCCESS, validator_->ValidateAddress(
         address, AddressProblemFilter(), &problems));
@@ skipping 56 matching lines @@
                                scoped_ptr<Json>* newjson) {
     DownloadJson(key, json);
     ASSERT_TRUE((*json)->GetJsonValueForKey(key, newjson));
   }
 
  private:
   // LoadRulesDelegate implementation.
   virtual void OnAddressValidationRulesLoaded(const std::string& country_code,
                                               bool success) {
     AddressData address_data;
-    address_data.country_code = country_code;
+    address_data.region_code = country_code;
     AddressValidator::Status status =
         validator_->ValidateAddress(address_data, AddressProblemFilter(), NULL);
     EXPECT_TRUE(success);
     EXPECT_EQ(AddressValidator::SUCCESS, status);
   }
 };
 
 TEST_F(ExampleAddressValidatorTest, examples) {
   scoped_ptr<Json> json(Json::Build());
   scoped_ptr<Json> json_examples;
   DownloadJsonValueForKey("examples", &json, &json_examples);
 
   std::string countries_str;
   ASSERT_TRUE(json_examples->GetStringValueForKey("countries", &countries_str));
   std::vector<std::string> countries;
   SplitString(countries_str, '~', &countries);
 
   for (std::vector<std::string>::const_iterator it = countries.begin();
        it != countries.end(); ++it) {
     TestCountry(*it);
   }
 }
 
 }  // addressinput
 }  // i18n