Merge Chromium at r12.0.742.93: New autofill strings

https://android-git.corp.google.com/g/#change,119876

Change-Id: I9738fe2c78da45492eeb74fb813d6e887363e591

1 files changed, 14 insertions, 13 deletions

diff --git a/android/ui/base/l10n/l10n_util.h b/android/ui/base/l10n/l10n_util.h
index 5599042..dfce4f9 100644
--- a/android/ui/base/l10n/l10n_util.h
+++ b/android/ui/base/l10n/l10n_util.h
@@ -75,24 +75,25 @@
 #define IDS_AUTOFILL_AREA_CODE_NOTEXT_RE 42
 #define IDS_AUTOFILL_PHONE_PREFIX_SEPARATOR_RE 43
 #define IDS_AUTOFILL_PHONE_SUFFIX_SEPARATOR_RE 44
+#define IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT 45
 // The following strings that contain 'DIALOG' are not used on Android, but are
 // listed here to avoid extra ifdefs. They have not been added to the framework
 // strings.xml.
-#define IDS_AUTOFILL_DIALOG_PROVINCE 45
-#define IDS_AUTOFILL_DIALOG_POSTAL_CODE 46
-#define IDS_AUTOFILL_DIALOG_STATE 47
-#define IDS_AUTOFILL_DIALOG_ZIP_CODE 48
-#define IDS_AUTOFILL_DIALOG_COUNTY 49
-#define IDS_AUTOFILL_DIALOG_ISLAND 50
-#define IDS_AUTOFILL_DIALOG_DISTRICT 51
-#define IDS_AUTOFILL_DIALOG_DEPARTMENT 52
-#define IDS_AUTOFILL_DIALOG_PREFECTURE 53
-#define IDS_AUTOFILL_DIALOG_PARISH 54
-#define IDS_AUTOFILL_DIALOG_AREA 55
-#define IDS_AUTOFILL_DIALOG_EMIRATE 56
+#define IDS_AUTOFILL_DIALOG_PROVINCE 46
+#define IDS_AUTOFILL_DIALOG_POSTAL_CODE 47
+#define IDS_AUTOFILL_DIALOG_STATE 48
+#define IDS_AUTOFILL_DIALOG_ZIP_CODE 49
+#define IDS_AUTOFILL_DIALOG_COUNTY 50
+#define IDS_AUTOFILL_DIALOG_ISLAND 51
+#define IDS_AUTOFILL_DIALOG_DISTRICT 52
+#define IDS_AUTOFILL_DIALOG_DEPARTMENT 53
+#define IDS_AUTOFILL_DIALOG_PREFECTURE 54
+#define IDS_AUTOFILL_DIALOG_PARISH 55
+#define IDS_AUTOFILL_DIALOG_AREA 56
+#define IDS_AUTOFILL_DIALOG_EMIRATE 57
 // Don't forget to update the count if you add a new message ID!
 // (And also update frameworks/base/core/java/android/webkit/L10nUtils.java)
-#define ANDROID_L10N_IDS_MESSAGE_COUNT 57
+#define ANDROID_L10N_IDS_MESSAGE_COUNT 58
 
 namespace l10n_util {
 string16 GetStringUTF16(int message_id);