Update recognized 'autocompletetype' tokens with the most recent values from the spec.

chrome/browser/autofill/form_structure.cc

 // 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.
 
 #include "chrome/browser/autofill/form_structure.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 108 matching lines @@
       autocomplete_type == ASCIIToUTF16("address-line1")) {
     *autofill_type = ADDRESS_HOME_LINE1;
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("address-line2")) {
     *autofill_type = ADDRESS_HOME_LINE2;
     return true;
   }
 
-  if (autocomplete_type == ASCIIToUTF16("locality")) {
+  if (autocomplete_type == ASCIIToUTF16("locality") ||
+      autocomplete_type == ASCIIToUTF16("city")) {
     *autofill_type = ADDRESS_HOME_CITY;
     return true;
   }
 
-  if (autocomplete_type == ASCIIToUTF16("administrative-area")) {
+  if (autocomplete_type == ASCIIToUTF16("administrative-area") ||
+      autocomplete_type == ASCIIToUTF16("state") ||
+      autocomplete_type == ASCIIToUTF16("province") ||
+      autocomplete_type == ASCIIToUTF16("region")) {
     *autofill_type = ADDRESS_HOME_STATE;
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("postal-code")) {
     *autofill_type = ADDRESS_HOME_ZIP;
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("country")) {
@@ skipping 14 matching lines @@
   if (autocomplete_type == ASCIIToUTF16("phone-full")) {
     *autofill_type = PHONE_HOME_WHOLE_NUMBER;
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("phone-country-code")) {
     *autofill_type = PHONE_HOME_COUNTRY_CODE;
     return true;
   }
 
-  if (autocomplete_type == ASCIIToUTF16("phone-city-code")) {
+  if (autocomplete_type == ASCIIToUTF16("phone-national")) {
+    *autofill_type = PHONE_HOME_CITY_AND_NUMBER;
+    return true;
+  }
+
+  if (autocomplete_type == ASCIIToUTF16("phone-area-code")) {
     *autofill_type = PHONE_HOME_CITY_CODE;
     return true;
   }
 
-  if (autocomplete_type == ASCIIToUTF16("phone-number")) {
+  // TODO(isherman): We should more fully support "phone-local-prefix" and
+  // "phone-local-suffix": http://crbug.com/92121
+  if (autocomplete_type == ASCIIToUTF16("phone-local") ||
+      autocomplete_type == ASCIIToUTF16("phone-local-prefix") ||
+      autocomplete_type == ASCIIToUTF16("phone-local-suffix")) {
     *autofill_type = PHONE_HOME_NUMBER;
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("fax-full")) {
     *autofill_type = PHONE_FAX_WHOLE_NUMBER;
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("fax-country-code")) {
     *autofill_type = PHONE_FAX_COUNTRY_CODE;
     return true;
   }
 
-  if (autocomplete_type == ASCIIToUTF16("fax-city-code")) {
+  if (autocomplete_type == ASCIIToUTF16("fax-national")) {
+    *autofill_type = PHONE_FAX_CITY_AND_NUMBER;
+    return true;
+  }
+
+  if (autocomplete_type == ASCIIToUTF16("fax-area-code")) {
     *autofill_type = PHONE_FAX_CITY_CODE;
     return true;
   }
 
-  if (autocomplete_type == ASCIIToUTF16("fax-number")) {
+  // TODO(isherman): We should more fully support "fax-local-prefix" and
+  // "fax-local-suffix": http://crbug.com/92121
+  if (autocomplete_type == ASCIIToUTF16("fax-local") ||
+      autocomplete_type == ASCIIToUTF16("fax-local-prefix") ||
+      autocomplete_type == ASCIIToUTF16("fax-local-suffix")) {
     *autofill_type = PHONE_FAX_NUMBER;
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("cc-full-name")) {
     *autofill_type = CREDIT_CARD_NAME;
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("cc-number")) {
@@ skipping 701 matching lines @@
     if (current_type != UNKNOWN_TYPE && already_saw_current_type) {
       // We reached the end of a section, so start a new section.
       seen_types.clear();
       current_section = (*field)->unique_name();
     }
 
     seen_types.insert(current_type);
     (*field)->set_section(current_section);
   }
 }