From 4bc64cabc561d5df211ed02dc75c85e41fa91312 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Tue, 8 Sep 2015 15:17:51 -0700
Subject: Change the JS app.viewerType() return value to "pdfium"

BUG=pdfium:181
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1331633002 .
---
 fpdfsdk/src/javascript/app.cpp                     |  2 +-
 testing/resources/javascript/app_alert.in          |  2 +-
 .../resources/javascript/app_alert_expected.txt    |  2 +-
 testing/resources/javascript/app_props.in          | 45 ++++++++++++++++++++++
 .../resources/javascript/app_props_expected.txt    |  1 +
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 testing/resources/javascript/app_props.in
 create mode 100644 testing/resources/javascript/app_props_expected.txt

diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp
index 8d895ab260..e70bd47625 100644
--- a/fpdfsdk/src/javascript/app.cpp
+++ b/fpdfsdk/src/javascript/app.cpp
@@ -188,7 +188,7 @@ FX_BOOL app::viewerType(IFXJS_Context* cc,
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
   if (vp.IsGetting()) {
-    vp << L"unknown";
+    vp << L"pdfium";
     return TRUE;
   }
 
diff --git a/testing/resources/javascript/app_alert.in b/testing/resources/javascript/app_alert.in
index 42f970a402..de6c8a8229 100644
--- a/testing/resources/javascript/app_alert.in
+++ b/testing/resources/javascript/app_alert.in
@@ -34,7 +34,7 @@ endobj
 {{object 11 0}} <<
 >>
 stream
-app.alert("This test passes if alert() logs output under the test utiltiy.");
+app.alert("This test passes if alert() logs output under the test utility.");
 endstream
 endobj
 {{xref}}
diff --git a/testing/resources/javascript/app_alert_expected.txt b/testing/resources/javascript/app_alert_expected.txt
index ac46b62203..91205bc91d 100644
--- a/testing/resources/javascript/app_alert_expected.txt
+++ b/testing/resources/javascript/app_alert_expected.txt
@@ -1 +1 @@
-Alert: This test passes if alert() logs output under the test utiltiy.
+Alert: This test passes if alert() logs output under the test utility.
diff --git a/testing/resources/javascript/app_props.in b/testing/resources/javascript/app_props.in
new file mode 100644
index 0000000000..fb5f9d645f
--- /dev/null
+++ b/testing/resources/javascript/app_props.in
@@ -0,0 +1,45 @@
+{{header}}
+{{object 1 0}} <<
+  /Type /Catalog
+  /Pages 2 0 R
+  /OpenAction 10 0 R
+>>
+endobj
+{{object 2 0}} <<
+  /Type /Pages
+  /Count 1
+  /Kids [
+    3 0 R
+  ]
+>>
+endobj
+% Page number 0.
+{{object 3 0}} <<
+  /Type /Page
+  /Parent 2 0 R
+  /Resources <<
+    /Font <</F1 15 0 R>>
+  >>
+  /Contents [21 0 R]
+  /MediaBox [0 0 612 792]
+>>
+% OpenAction action
+{{object 10 0}} <<
+  /Type /Action
+  /S /JavaScript
+  /JS 11 0 R
+>>
+endobj
+% JS program to exexute
+{{object 11 0}} <<
+>>
+stream
+app.alert("app.viewerType property value: " + app.viewerType);
+endstream
+endobj
+{{xref}}
+trailer <<
+  /Root 1 0 R
+>>
+{{startxref}}
+%%EOF
diff --git a/testing/resources/javascript/app_props_expected.txt b/testing/resources/javascript/app_props_expected.txt
new file mode 100644
index 0000000000..405f9c8227
--- /dev/null
+++ b/testing/resources/javascript/app_props_expected.txt
@@ -0,0 +1 @@
+Alert: app.viewerType property value: pdfium
-- 
cgit v1.2.3