Combine StrToInt methods.

core/src/fxcrt/fx_extension_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 
 TEST(fxcrt, FXSYS_toHexDigit) {
   EXPECT_EQ(10, FXSYS_toHexDigit('a'));
   EXPECT_EQ(10, FXSYS_toHexDigit('A'));
   EXPECT_EQ(7, FXSYS_toHexDigit('7'));
   EXPECT_EQ(0, FXSYS_toHexDigit('i'));
 }
 
 TEST(fxcrt, FXSYS_toDecimalDigit) {
+  {
+    uint8_t ch = '7';
+    EXPECT_EQ(7, FXSYS_toDecimalDigit(ch));
+    ch = 'a';
+    EXPECT_EQ(0, FXSYS_toDecimalDigit(ch));
+  }
+  {
+    int ch = '7';
+    EXPECT_EQ(7, FXSYS_toDecimalDigit(ch));
+    ch = 'a';
+    EXPECT_EQ(0, FXSYS_toDecimalDigit(ch));
+  }
+
   EXPECT_EQ(7, FXSYS_toDecimalDigit('7'));
   EXPECT_EQ(0, FXSYS_toDecimalDigit('a'));
+  EXPECT_EQ(7, FXSYS_toDecimalDigit(L'7'));
+  EXPECT_EQ(0, FXSYS_toDecimalDigit(L'a'));
 }
 
-TEST(fxcrt, FXSYS_toDecimalDigitWide) {
-  EXPECT_EQ(7, FXSYS_toDecimalDigitWide(L'7'));
-  EXPECT_EQ(0, FXSYS_toDecimalDigitWide(L'a'));
+TEST(fxcrt, FXSYS_isDecimalDigit) {
+  EXPECT_TRUE(FXSYS_isDecimalDigit('7'));
+  EXPECT_TRUE(FXSYS_isDecimalDigit(L'7'));
+  EXPECT_FALSE(FXSYS_isDecimalDigit('a'));
+  EXPECT_FALSE(FXSYS_isDecimalDigit(L'a'));
 }