Revert of Autofill: Fix recognition of Walmart ZIP code.

components/autofill/core/browser/address_field.cc

 // 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.
 
 #include "components/autofill/core/browser/address_field.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 178 matching lines @@
                              MATCH_DEFAULT | MATCH_SELECT,
                              &country_);
 }
 
 bool AddressField::ParseZipCode(AutofillScanner* scanner) {
   // Parse a zip code.  On some UK pages (e.g. The China Shop2.html) this
   // is called a "post code".
   if (zip_)
     return false;
 
-  // Some sites use type="tel" for zip fields (to get a numerical input).
-  // http://crbug.com/426958
-  if (!ParseFieldSpecifics(scanner,
-                           UTF8ToUTF16(autofill::kZipCodeRe),
-                           MATCH_DEFAULT | MATCH_TELEPHONE,
-                           &zip_)) {
+  base::string16 pattern = UTF8ToUTF16(autofill::kZipCodeRe);
+  if (!ParseField(scanner, pattern, &zip_))
     return false;
-  }
 
   // Look for a zip+4, whose field name will also often contain
   // the substring "zip".
-  ParseFieldSpecifics(scanner,
-                      UTF8ToUTF16(autofill::kZip4Re),
-                      MATCH_DEFAULT | MATCH_TELEPHONE,
-                      &zip4_);
+  ParseField(scanner, UTF8ToUTF16(autofill::kZip4Re), &zip4_);
   return true;
 }
 
 bool AddressField::ParseCity(AutofillScanner* scanner) {
   // Parse a city name.  Some UK pages (e.g. The China Shop2.html) use
   // the term "town".
   if (city_)
     return false;
 
   // Select fields are allowed here.  This occurs on top-100 site rediff.com.
   return ParseFieldSpecifics(scanner,
                              UTF8ToUTF16(autofill::kCityRe),
                              MATCH_DEFAULT | MATCH_SELECT,
                              &city_);
 }
 
 bool AddressField::ParseState(AutofillScanner* scanner) {
   if (state_)
     return false;
 
   return ParseFieldSpecifics(scanner,
                              UTF8ToUTF16(autofill::kStateRe),
                              MATCH_DEFAULT | MATCH_SELECT,
                              &state_);
 }
 
 }  // namespace autofill