Merge to XFA: Fix strings, ..., void return types for Consts.h.

(cherry picked from commit f9e40aec10263f9445d69598657f42550294d653)
Orignal Review URL: https://codereview.chromium.org/1342433002 .

R=thestig@chromium.org
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1338003004 .

2 files changed, 104 insertions, 3 deletions

diff --git a/testing/resources/javascript/consts.in b/testing/resources/javascript/consts.in
index 2ed239a63d..a717ec873a 100644
--- a/testing/resources/javascript/consts.in
+++ b/testing/resources/javascript/consts.in
@@ -36,12 +36,37 @@ endobj
 stream
 
 function doTest(name, props) {
-  for (var i = 0; i < props.length; ++i) {
-    var expr = name + "." + props[i];
-    app.alert(expr + " is " + eval(expr));
+  try {
+    for (var i = 0; i < props.length; ++i) {
+      var expr = name + "." + props[i];
+      app.alert(expr + " is " + eval(expr));
+    }
+  } catch (e) {
+    app.alert("ERROR: " + e.toString());
   }
 }
 
+function doGlobalTest(props) {
+  try {
+    for (var i = 0; i < props.length; ++i) {
+      app.alert(props[i] + " is " + eval(props[i]));
+    }
+  } catch (e) {
+    app.alert("ERROR: " + e.toString());
+  }
+}
+
+function doGlobalArrayTest(props) {
+  try {
+    for (var i = 0; i < props.length; ++i) {
+      app.alert(props[i] + " is\n  " + eval(props[i]).join(",\n  "));
+    }
+  } catch (e) {
+    app.alert("ERROR: " + e.toString());
+  }
+}
+
+
 try {
   doTest("border", ["s", "b", "d", "i", "u", "nonesuch"]);
   doTest("display", ["visible", "hidden", "noPrint", "noView", "nonesuch"]);
@@ -58,6 +83,35 @@ try {
   doTest("style", ["ch", "cr", "di", "ci", "st", "sq", "nonesuch"]);
   doTest("zoomtype", ["none", "fitP", "fitW", "fitH", "fitV", "pref", "refW",
                       "nonesuch"]);
+
+  doGlobalTest([
+    "IDS_GREATER_THAN",
+    "IDS_GT_AND_LT",
+    "IDS_LESS_THAN",
+    "IDS_INVALID_MONTH",
+    "IDS_INVALID_DATE",
+    "IDS_INVALID_VALUE",
+    "IDS_AM",
+    "IDS_PM",
+    "IDS_MONTH_INFO",
+    "IDS_STARTUP_CONSOLE_MSG"
+  ]);
+
+  doGlobalArrayTest([
+    "RE_NUMBER_ENTRY_DOT_SEP",
+    "RE_NUMBER_COMMIT_DOT_SEP",
+    "RE_NUMBER_ENTRY_COMMA_SEP",
+    "RE_NUMBER_COMMIT_COMMA_SEP",
+    "RE_ZIP_ENTRY",
+    "RE_ZIP_COMMIT",
+    "RE_ZIP4_ENTRY",
+    "RE_ZIP4_COMMIT",
+    "RE_PHONE_ENTRY",
+    "RE_PHONE_COMMIT",
+    "RE_SSN_ENTRY",
+    "RE_SSN_COMMIT"
+  ]);
+
 } catch (e) {
   app.alert("ERROR: " + e.toString());
 }
@@ -69,3 +123,4 @@ trailer <<
 >>
 {{startxref}}
 %%EOF
+
diff --git a/testing/resources/javascript/consts_expected.txt b/testing/resources/javascript/consts_expected.txt
index c32d480f14..4476c62b24 100644
--- a/testing/resources/javascript/consts_expected.txt
+++ b/testing/resources/javascript/consts_expected.txt
@@ -60,3 +60,49 @@ Alert: zoomtype.fitV is FitVisibleWidth
 Alert: zoomtype.pref is Preferred
 Alert: zoomtype.refW is ReflowWidth
 Alert: zoomtype.nonesuch is undefined
+Alert: IDS_GREATER_THAN is Invalid value: must be greater than or equal to % s.
+Alert: IDS_GT_AND_LT is Invalid value: must be greater than or equal to % s and less than or equal to % s.
+Alert: IDS_LESS_THAN is Invalid value: must be less than or equal to % s.
+Alert: IDS_INVALID_MONTH is **Invalid**
+Alert: IDS_INVALID_DATE is Invalid date / time: please ensure that the date / time exists.Field
+Alert: IDS_INVALID_VALUE is The value entered does not match the format of the field
+Alert: IDS_AM is am
+Alert: IDS_PM is pm
+Alert: IDS_MONTH_INFO is January[1] February[2] March[3] April[4] May[5] June[6] July[7] August[8] September[9] October[10] November[11] December[12] Sept[9] Jan[1] Feb[2] Mar[3] Apr[4] Jun[6] Jul[7] Aug[8] Sep[9] Oct[10] Nov[11] Dec[12]
+Alert: IDS_STARTUP_CONSOLE_MSG is ** ^ _ ^ **
+Alert: RE_NUMBER_ENTRY_DOT_SEP is
+  [+-]?\d*\.?\d*
+Alert: RE_NUMBER_COMMIT_DOT_SEP is
+  [+-]?\d+(\.\d+)?,
+  [+-]?\.\d+,
+  [+-]?\d+\.
+Alert: RE_NUMBER_ENTRY_COMMA_SEP is
+  [+-]?\d*,?\d*
+Alert: RE_NUMBER_COMMIT_COMMA_SEP is
+  [+-]?\d+([.,]\d+)?,
+  [+-]?[.,]\d+,
+  [+-]?\d+[.,]
+Alert: RE_ZIP_ENTRY is
+  \d{0,5}
+Alert: RE_ZIP_COMMIT is
+  \d{5}
+Alert: RE_ZIP4_ENTRY is
+  \d{0,5}(\.|[- ])?\d{0,4}
+Alert: RE_ZIP4_COMMIT is
+  \d{5}(\.|[- ])?\d{4}
+Alert: RE_PHONE_ENTRY is
+  \d{0,3}(\.|[- ])?\d{0,3}(\.|[- ])?\d{0,4},
+  \(\d{0,3},
+  \(\d{0,3}\)(\.|[- ])?\d{0,3}(\.|[- ])?\d{0,4},
+  \(\d{0,3}(\.|[- ])?\d{0,3}(\.|[- ])?\d{0,4},
+  \d{0,3}\)(\.|[- ])?\d{0,3}(\.|[- ])?\d{0,4},
+  011(\.|[- \d])*
+Alert: RE_PHONE_COMMIT is
+  \d{3}(\.|[- ])?\d{4},
+  \d{3}(\.|[- ])?\d{3}(\.|[- ])?\d{4},
+  \(\d{3}\)(\.|[- ])?\d{3}(\.|[- ])?\d{4},
+  011(\.|[- \d])*
+Alert: RE_SSN_ENTRY is
+  \d{0,3}(\.|[- ])?\d{0,2}(\.|[- ])?\d{0,4}
+Alert: RE_SSN_COMMIT is
+  \d{3}(\.|[- ])?\d{2}(\.|[- ])?\d{4}