Autofill: Apply the same field match mask to all phone field subtypes.

components/autofill/core/browser/phone_field.h

 // Copyright 2013 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_CORE_BROWSER_PHONE_FIELD_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_FIELD_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 61 matching lines @@
   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.
   };
 
   static const Parser kPhoneFieldGrammars[];
 
   PhoneField();
 
-  // Returns the regular expression string correspoding to |regex_id|
-  static base::string16 GetRegExp(RegexType regex_id);
+  // Returns the regular expression string corresponding to |regex_id|
+  static std::string GetRegExp(RegexType regex_id);
+
+  // Convenient wrapper for ParseFieldSpecifics().
+  static bool ParsePhoneField(AutofillScanner* scanner,
+                              const std::string& regex,
+                              AutofillField** field);
 
   // FIELD_PHONE is always present; holds suffix if prefix is present.
   // The rest could be NULL.
   AutofillField* parsed_phone_fields_[FIELD_MAX];
 
   DISALLOW_COPY_AND_ASSIGN(PhoneField);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_FIELD_H_