Merge to XFA: Cleanup CJS_PublicMethods:

fpdfsdk/src/javascript/public_methods_embeddertest.cpp

 // Copyright 2015 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 
 #include "core/include/fxcrt/fx_string.h"
 #include "fpdfsdk/src/javascript/PublicMethods.h"
 #include "testing/js_embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 double RoundDownDate(double date) {
   return date - fmod(date, 86400000);
 }
 
 }  // namespace
 
 class PublicMethodsEmbedderTest : public JSEmbedderTest {};
 
 TEST_F(PublicMethodsEmbedderTest, MakeRegularDate) {
   v8::Isolate::Scope isolate_scope(isolate());
 #ifdef PDF_ENABLE_XFA
   v8::Locker locker(isolate());
 #endif  // PDF_ENABLE_XFA
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(GetV8Context());
-  FX_BOOL bWrongFormat;
+  bool bWrongFormat;
   double date;
 
   // 1968
   bWrongFormat = false;
   date = CJS_PublicMethods::MakeRegularDate(L"06/25/1968", L"mm/dd/yyyy",
-                                            bWrongFormat);
+                                            &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(-47865600000, date);
   EXPECT_FALSE(bWrongFormat);
 
   // 1968
   bWrongFormat = false;
   date = CJS_PublicMethods::MakeRegularDate(L"25061968", L"ddmmyyyy",
-                                            bWrongFormat);
+                                            &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(-47865600000, date);
   EXPECT_FALSE(bWrongFormat);
 
   // 1968
   bWrongFormat = false;
   date = CJS_PublicMethods::MakeRegularDate(L"19680625", L"yyyymmdd",
-                                            bWrongFormat);
+                                            &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(-47865600000, date);
   EXPECT_FALSE(bWrongFormat);
 
   // 1985
   bWrongFormat = false;
   date = CJS_PublicMethods::MakeRegularDate(L"31121985", L"ddmmyyyy",
-                                            bWrongFormat);
+                                            &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(504835200000.0, date);
   EXPECT_FALSE(bWrongFormat);
 
   // 2085, the other '85.
   bWrongFormat = false;
-  date = CJS_PublicMethods::MakeRegularDate(L"311285", L"ddmmyy", bWrongFormat);
+  date =
+      CJS_PublicMethods::MakeRegularDate(L"311285", L"ddmmyy", &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(3660595200000.0, date);
   EXPECT_FALSE(bWrongFormat);
 
   // 1995
   bWrongFormat = false;
   date = CJS_PublicMethods::MakeRegularDate(L"01021995", L"ddmmyyyy",
-                                            bWrongFormat);
+                                            &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(791596800000.0, date);
   EXPECT_FALSE(bWrongFormat);
 
   // 2095, the other '95.
   bWrongFormat = false;
-  date = CJS_PublicMethods::MakeRegularDate(L"010295", L"ddmmyy", bWrongFormat);
+  date =
+      CJS_PublicMethods::MakeRegularDate(L"010295", L"ddmmyy", &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(3947356800000.0, date);
   EXPECT_FALSE(bWrongFormat);
 
   // 2005
   bWrongFormat = false;
   date = CJS_PublicMethods::MakeRegularDate(L"01022005", L"ddmmyyyy",
-                                            bWrongFormat);
+                                            &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(1107216000000.0, date);
   EXPECT_FALSE(bWrongFormat);
 
   // 2005
   bWrongFormat = false;
-  date = CJS_PublicMethods::MakeRegularDate(L"010205", L"ddmmyy", bWrongFormat);
+  date =
+      CJS_PublicMethods::MakeRegularDate(L"010205", L"ddmmyy", &bWrongFormat);
   date = RoundDownDate(date);
   EXPECT_DOUBLE_EQ(1107216000000.0, date);
   EXPECT_FALSE(bWrongFormat);
 }
 
 TEST_F(PublicMethodsEmbedderTest, MakeFormatDate) {
   v8::Isolate::Scope isolate_scope(isolate());
 #ifdef PDF_ENABLE_XFA
   v8::Locker locker(isolate());
 #endif  // PDF_ENABLE_XFA
@@ skipping 49 matching lines @@
   EXPECT_STREQ(L"208531", formatted_date);
 
   // 2095-02-01
   formatted_date =
       CJS_PublicMethods::MakeFormatDate(3947356800000.0, L"ddmmyy");
   EXPECT_STREQ(L"010295", formatted_date);
   formatted_date =
       CJS_PublicMethods::MakeFormatDate(3947356800000.0, L"mmddyyyy");
   EXPECT_STREQ(L"02012095", formatted_date);
 }