Two sets of Autofill tests....

chrome/browser/automation/testing_automation_provider.cc

Index: chrome/browser/automation/testing_automation_provider.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider.cc	(revision 79656)
+++ chrome/browser/automation/testing_automation_provider.cc	(working copy)
@@ -4320,6 +4320,7 @@
 std::map<AutofillFieldType, std::string>
     TestingAutomationProvider::GetAutofillFieldToStringMap() {
   std::map<AutofillFieldType, std::string> autofill_type_to_string;
+  // Strings ordered by order of fields when adding a profile in Autofill prefs.
   autofill_type_to_string[NAME_FIRST] = "NAME_FIRST";
   autofill_type_to_string[NAME_MIDDLE] = "NAME_MIDDLE";
   autofill_type_to_string[NAME_LAST] = "NAME_LAST";
@@ -4331,10 +4332,14 @@
   autofill_type_to_string[ADDRESS_HOME_STATE] = "ADDRESS_HOME_STATE";
   autofill_type_to_string[ADDRESS_HOME_ZIP] = "ADDRESS_HOME_ZIP";
   autofill_type_to_string[ADDRESS_HOME_COUNTRY] = "ADDRESS_HOME_COUNTRY";
+  autofill_type_to_string[PHONE_HOME_COUNTRY_CODE] =
+      "PHONE_HOME_COUNTRY_CODE";
+  autofill_type_to_string[PHONE_HOME_CITY_CODE] = "PHONE_HOME_CITY_CODE";
   autofill_type_to_string[PHONE_HOME_WHOLE_NUMBER] =
       "PHONE_HOME_WHOLE_NUMBER";
+  autofill_type_to_string[PHONE_FAX_COUNTRY_CODE] = "PHONE_FAX_COUNTRY_CODE";
+  autofill_type_to_string[PHONE_FAX_CITY_CODE] = "PHONE_FAX_CITY_CODE";
   autofill_type_to_string[PHONE_FAX_WHOLE_NUMBER] = "PHONE_FAX_WHOLE_NUMBER";
-  autofill_type_to_string[NAME_FIRST] = "NAME_FIRST";
   return autofill_type_to_string;
 }