These changes *are* for review :)

chrome/browser/autofill/autofill_profile.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_AUTOFILL_PROFILE_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_
 #pragma once
 
 #include <stddef.h>
 #include <list>
@@ skipping 101 matching lines @@
   // Equality operators compare GUIDs and the contents in the comparison.
   // TODO(dhollowa): This needs to be made multi-profile once Sync updates.
   bool operator==(const AutofillProfile& profile) const;
   virtual bool operator!=(const AutofillProfile& profile) const;
 
   // Returns concatenation of full name and address line 1.  This acts as the
   // basis of comparison for new values that are submitted through forms to
   // aid with correct aggregation of new data.
   const string16 PrimaryValue() const;
 
+  // Normalizes the home phone and fax numbers.
+  // Should be called after all of the form data is imported into profile.
+  // If PHONE_*_WHOLE_NUMBER is not set, then derives it from PHONE_*_CITY_CODE,
+  // PHONE_*_COUNTRY_CODE and PHONE_*_CITY_AND_NUMBER.
+  // Drops unparsable numbers, so the numbers that are incomplete or wrong
+  // are not saved. Returns true if all numbers were successfully parsed,
+  // false otherwise.
+  bool NormalizePhones();
+
   // Overwrites the single-valued field data in |profile| with this
   // Profile.  Or, for multi-valued fields append the new values.
   void OverwriteWithOrAddTo(const AutofillProfile& profile);
 
  private:
   typedef std::vector<const FormGroup*> FormGroupList;
 
+  // Checks if the |phone| is in the |existing_phones| using fuzzy matching:
+  // for example, "1-800-FLOWERS", "18003569377", "(800)356-9377" and "356-9377"
+  // are considered the same.
+  // Adds the |phone| to the |existing_phones| if not already there.
+  void AddPhoneIfUnique(const string16& phone,
+                        std::vector<string16>* existing_phones);
+
   // Builds inferred label from the first |num_fields_to_include| non-empty
   // fields in |label_fields|. Uses as many fields as possible if there are not
   // enough non-empty fields.
   string16 ConstructInferredLabel(
       const std::vector<AutofillFieldType>& label_fields,
       size_t num_fields_to_include) const;
 
   // Creates inferred labels for |profiles| at indices corresponding to
   // |indices|, and stores the results to the corresponding elements of
   // |created_labels|. These labels include enough fields to differentiate among
@@ skipping 15 matching lines @@
   // The label presented to the user when selecting a profile.
   string16 label_;
 
   // The guid of this profile.
   std::string guid_;
 
   // Personal information for this profile.
   std::vector<NameInfo> name_;
   std::vector<EmailInfo> email_;
   CompanyInfo company_;
-  std::vector<HomePhoneNumber> home_number_;
-  std::vector<FaxNumber> fax_number_;
+  std::vector<PhoneNumber> home_number_;
+  std::vector<PhoneNumber> fax_number_;
   Address address_;
 };
 
 // So we can compare AutofillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile);
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_