requestAutocomplete should not unlatinize administrative region names.

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

 // 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 148 matching lines @@
   // 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.
+  //
+  // If |keep_input_latin| is true, then does not convert a latinized region
+  // name into a sub key. For example, tOKYo will change to TOKYO. If
+  // |keep_input_latin| is false, then converts a latinized region name into a
+  // sub key. For example, tOKYo becomes 東京都.
+  //
+  // |sub_key| should not be NULL.
   bool CanonicalizeSubKey(const std::string& user_input,
+                          bool keep_input_latin,
                           std::string* sub_key) const;
 
  private:
-  // Finds |target| in |values| and sets |sub_key| to the associated value from
-  // |sub_keys_|, or returns false if |target| is not in |values|.
-  bool GetMatchingSubKey(const std::string& target,
-                         const std::vector<std::string>& values,
-                         std::string* sub_key) const;
-
   std::string key_;
   std::string name_;
   std::string latin_name_;
   std::vector<std::vector<FormatElement> > format_;
   std::vector<std::vector<FormatElement> > latin_format_;
   std::vector<AddressField> required_;
   std::vector<std::string> sub_keys_;
   std::vector<std::string> sub_names_;
   // The Latin names (when |sub_names_| is not in Latin characters).
   std::vector<std::string> sub_lnames_;
   std::vector<std::string> languages_;
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(Rule);
 };
 
 }  // namespace addressinput
 }  // namespace i18n
 
 #endif  // I18N_ADDRESSINPUT_RULE_H_