Merge to XFA: Return error information from pdfium to JS.

Cherry-pick from b720d0a14601f1496ef15297bc46d401f5a2a890 +
Manually resolve merge conflicts +
Fix more IWYU to fix compile.

Original Review URL: https://codereview.chromium.org/963193003
TBR=thestig@chromium.org

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

1 files changed, 15 insertions, 15 deletions

diff --git a/testing/resources/javascript/document_props.in b/testing/resources/javascript/document_props.in
index 8ab7e3d566..c628fafad2 100644
--- a/testing/resources/javascript/document_props.in
+++ b/testing/resources/javascript/document_props.in
@@ -105,27 +105,27 @@ var document_props = [
 ];
 
 function testGetProps(props) {
-  try {
-    app.alert('*** Getting properties ***');
-    for (var i = 0; i < props.length; ++i) {
-        var expr1 = "this." + props[i];
-        var expr2 = "typeof " + expr1;
-        app.alert(expr1 + " is " + eval(expr2) + ' ' + eval(expr1));
+  app.alert('*** Getting properties ***');
+  for (var i = 0; i < props.length; ++i) {
+    try {
+      var expr1 = "this." + props[i];
+      var expr2 = "typeof " + expr1;
+      app.alert(expr1 + " is " + eval(expr2) + ' ' + eval(expr1));
+    } catch (e) {
+      app.alert("ERROR: " + e.toString());
     }
-  } catch (e) {
-    app.alert("ERROR: " + e.toString());
   }
 }
 
 function testSetProps(props) {
-  try {
-    app.alert('*** Setting properties ***');
-    for (var i = 0; i < props.length; ++i) {
-        var expr1 = "this." + props[i] + ' = 3;'
-        app.alert(expr1 + " yields " + eval(expr1));
+  app.alert('*** Setting properties ***');
+  for (var i = 0; i < props.length; ++i) {
+    try {
+      var expr1 = "this." + props[i] + ' = 3;'
+      app.alert(expr1 + " yields " + eval(expr1));
+    } catch (e) {
+      app.alert("ERROR: " + e.toString());
     }
-  } catch (e) {
-    app.alert("ERROR: " + e.toString());
   }
 }