[Autofill] Ensure that clients pass the correct region info when parsing phone numbers.

chrome/browser/autofill/phone_number.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 CHROME_BROWSER_AUTOFILL_PHONE_NUMBER_H_
 #define CHROME_BROWSER_AUTOFILL_PHONE_NUMBER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 38 matching lines @@
   // The class used to combine home phone parts into a whole number.
   class PhoneCombineHelper {
    public:
     PhoneCombineHelper();
     ~PhoneCombineHelper();
 
     // If |type| is a phone field type, saves the |value| accordingly and
     // returns true.  For all other field types returs false.
     bool SetInfo(AutofillFieldType type, const string16& value);
 
-    // Returns true if parsing was successful, false otherwise.
-    bool ParseNumber(const std::string& region, string16* value);
+    // Parses the number built up from pieces stored via SetInfo() according to
+    // the specified |profile|'s country code, falling back to the given
+    // |app_locale| if the |profile| has no associated country code.  Returns
+    // true if parsing was successful, false otherwise.
+    bool ParseNumber(const AutofillProfile& profile,
+                     const std::string& app_locale,
+                     string16* value);
 
     // Returns true if both |phone_| and |whole_number_| are empty.
     bool IsEmpty() const;
 
    private:
     string16 country_;
     string16 city_;
     string16 phone_;
     string16 whole_number_;
   };
 
  private:
   // FormGroup:
   virtual void GetSupportedTypes(FieldTypeSet* supported_types) const OVERRIDE;
 
-  // Returns the region code for this phone number, which is an ISO 3166
-  // 2-letter country code.  The name "region" is chosen since "country code"
-  // already refers to part of a phone number.  The returned value is based on
-  // the |profile_|; if the |profile_| does not have a country code associated
-  // with it, falls back to the country code corresponding to the |app_locale|.
-  std::string GetRegion(const std::string& app_locale) const;
-
   // Updates the cached parsed number if the profile's region has changed
   // since the last time the cache was updated.
   void UpdateCacheIfNeeded(const std::string& app_locale) const;
 
   // The phone number.
   string16 number_;
   // Profile which stores the region used as hint when normalizing the number.
   const AutofillProfile* profile_;  // WEAK
 
   // Cached number.
   mutable autofill_i18n::PhoneObject cached_parsed_phone_;
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_PHONE_NUMBER_H_