autocomplete: add ability to get full address (hidden behind a flag).

third_party/libaddressinput/chromium/cpp/src/rule.h

Index: third_party/libaddressinput/chromium/cpp/src/rule.h
diff --git a/third_party/libaddressinput/chromium/cpp/src/rule.h b/third_party/libaddressinput/chromium/cpp/src/rule.h
index 604ec0a152f6431415075b60f5ab9ceee5432fa9..dfe813a12a4cf056e72b4ddb8d976aab3058a6f7 100644
--- a/third_party/libaddressinput/chromium/cpp/src/rule.h
+++ b/third_party/libaddressinput/chromium/cpp/src/rule.h
@@ -139,31 +139,18 @@ class Rule {
   // Returns the postal code format, for example "\\d{5}([ \\-]\\d{4})?".
   const std::string& GetPostalCodeFormat() const { return postal_code_format_; }
 
-  // The message string identifier for admin area name. If not set, then
-  // INVALID_MESSAGE_ID.
-  int GetAdminAreaNameMessageId() const { return admin_area_name_message_id_; }
-
-  // The error message string identifier for an invalid admin area. If not set,
-  // then INVALID_MESSAGE_ID.
-  int GetInvalidAdminAreaMessageId() const {
-    return invalid_admin_area_message_id_;
+  // A string identifying the type of admin area name for this country, e.g.
+  // "state", "province", or "district".
+  const std::string& GetAdminAreaNameType() const {
+    return admin_area_name_type_;
   }
 
-  // The message string identifier for postal code name. If not set, then
-  // INVALID_MESSAGE_ID.
-  int GetPostalCodeNameMessageId() const {
-    return postal_code_name_message_id_;
+  // A string identifying the type of postal code name for this country, either
+  // "postal" or "zip".
+  const std::string& GetPostalCodeNameType() const {
+    return postal_code_name_type_;
   }
 
-  // The error message string identifier for an invalid postal code. If not set,
-  // then INVALID_MESSAGE_ID.
-  int GetInvalidPostalCodeMessageId() const {
-    return invalid_postal_code_message_id_;
-  }
-
-  // Returns the error message string identifier for an invalid |field|.
-  int GetInvalidFieldMessageId(AddressField field) const;
-
   // Outputs the sub key for a given user input. For example, Texas will map to
   // TX.
   //
@@ -192,10 +179,8 @@ class Rule {
   std::vector<std::string> input_languages_;
   std::string language_;
   std::string postal_code_format_;
-  int admin_area_name_message_id_;
-  int invalid_admin_area_message_id_;
-  int postal_code_name_message_id_;
-  int invalid_postal_code_message_id_;
+  std::string admin_area_name_type_;
+  std::string postal_code_name_type_;
 
   DISALLOW_COPY_AND_ASSIGN(Rule);
 };