Autofill: Remove fax number completely.

chrome/browser/autofill/phone_field.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_FIELD_H_
 #define CHROME_BROWSER_AUTOFILL_PHONE_FIELD_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 19 matching lines @@
  protected:
   // FormField:
   virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseOneLinePhone);
   FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseTwoLinePhone);
   FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ThreePartPhoneNumber);
   FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ThreePartPhoneNumberPrefixSuffix);
   FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ThreePartPhoneNumberPrefixSuffix2);
-  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseOneLineFax);
-  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseTwoLineFax);
-  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ThreePartFaxNumberPrefixSuffix);
   FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, CountryAndCityAndPhoneNumber);
 
   PhoneField();
 
-  enum PhoneType {
-    PHONE_TYPE_FIRST = 0,
-    HOME_PHONE = PHONE_TYPE_FIRST,
-    FAX_PHONE,
-
-    // Must be last.
-    PHONE_TYPE_MAX,
-  };
-
-  // Some field names are different for phone and fax.
+  // Some field names are different for phone.

[Ilya Sherman, 2011/09/15 03:47:08]

nit: This comment no longer makes sense.  I think all of these methods can be
inlined into GetRegExp().

[James Hawkins, 2011/09/16 03:23:28]

Done.

   string16 GetCountryRegex() const;
   // This string includes all area code separators, including NoText.
   string16 GetAreaRegex() const;
   // Separator of the area code in the case fields are formatted without
   // any text indicating what fields are (e.g. field1 "(" field2 ")" field3 "-"
   // field4 means Country Code, Area Code, Prefix, Suffix)
   string16 GetAreaNoTextRegex() const;
   string16 GetPhoneRegex() const;
   string16 GetPrefixSeparatorRegex() const;
   string16 GetPrefixRegex() const;
@@ skipping 17 matching lines @@
     // Separates regexps in grammar.
     REGEX_SEPARATOR,
   };
 
   string16 GetRegExp(RegexType regex_id) const;
 
   // |field| - field to fill up on successful parsing.
   // |iter| - in/out. Form field iterator, points to the first field that is
   //   attempted to be parsed. If parsing successful, points to the first field
   //   after parsed fields.
-  // |regular_phone| - true if the parsed phone is a HOME phone, false
-  //   otherwise.
-  static bool ParseInternal(PhoneField* field,
-                            AutofillScanner* scanner,
-                            bool regular_phone);
+  // TODO(isherman): This method doc is out of date.
+  static bool ParseInternal(PhoneField* field, AutofillScanner* scanner);
 
-  void SetPhoneType(PhoneType phone_type);
-
-  // Field types are different as well, so we create a temporary phone number,
-  // to get relevant field types.
+  // TODO(jhawkins): This is probably not necessary anymore.

[Ilya Sherman, 2011/09/15 03:47:08]

Indeed, I think you can nix it.

[James Hawkins, 2011/09/16 03:23:28]

Done.

   scoped_ptr<PhoneNumber> number_;
-  PhoneType phone_type_;
-
 
   // Parsed fields.
   enum PhonePart {
     FIELD_NONE = -1,
     FIELD_COUNTRY_CODE,
     FIELD_AREA_CODE,
     FIELD_PHONE,
     FIELD_SUFFIX,
     FIELD_EXTENSION,
 
     FIELD_MAX,
   };
 
   // FIELD_PHONE is always present; holds suffix if prefix is present.
   // The rest could be NULL.
   const AutofillField* parsed_phone_fields_[FIELD_MAX];
 
   static struct Parser {
     RegexType regex;       // Field matching reg-ex.
     PhonePart phone_part;  // Index of the field.
     size_t max_size;       // Max size of the field to match. 0 means any.
   } phone_field_grammars_[];
 
   DISALLOW_COPY_AND_ASSIGN(PhoneField);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_PHONE_FIELD_H_