Remove application locale cache in autofill code.

components/autofill/browser/phone_number_i18n.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_I18N_H_
 #define COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_I18N_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 21 matching lines @@
     const string16& value,
     const std::string& region,
     string16* country_code,
     string16* city_code,
     string16* number,
     i18n::phonenumbers::PhoneNumber* i18n_number) WARN_UNUSED_RESULT;
 
 // Normalizes phone number, by changing digits in the extended fonts
 // (such as \xFF1x) into '0'-'9'. Also strips out non-digit characters.
 string16 NormalizePhoneNumber(const string16& value,
-                              const std::string& region);
+                              const std::string& region,
+                              const std::string& app_locale);
 
 // Constructs whole phone number from parts.
 // |city_code| - area code, could be empty.
 // |country_code| - country code, could be empty.
 // |number| - local number, should not be empty.
 // |region| - current region, the parsing is based on.
+// |app_locale| - current app locale.
 // |whole_number| - constructed whole number.
 // Separator characters are stripped before parsing the digits.
 // Returns true if parsing was successful, false otherwise.
 bool ConstructPhoneNumber(const string16& country_code,
                           const string16& city_code,
                           const string16& number,
                           const std::string& region,
+                          const std::string& app_locale,
                           string16* whole_number) WARN_UNUSED_RESULT;
 
 // Returns true if |number_a| and |number_b| parse to the same phone number in
 // the given |region|.
 bool PhoneNumbersMatch(const string16& number_a,
                        const string16& number_b,
-                       const std::string& region);
+                       const std::string& region,
+                       const std::string& app_locale);
 
 // The cached phone number, does parsing only once, improves performance.
 class PhoneObject {
  public:
-  PhoneObject(const string16& number, const std::string& region);
+  PhoneObject(const string16& number,
+              const std::string& region,
+              const std::string& app_locale);
   PhoneObject(const PhoneObject&);
   PhoneObject();
   ~PhoneObject();
 
   std::string region() const { return region_; }
 
   string16 country_code() const { return country_code_; }
   string16 city_code() const { return city_code_; }
   string16 number() const { return number_; }
 
@@ skipping 19 matching lines @@
   mutable string16 formatted_number_;
 
   // The whole number, normalized to contain only digits if possible.
   // Set on first request.
   mutable string16 whole_number_;
 };
 
 }  // namespace autofill_i18n
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_I18N_H_