Fold CJS_EmbedObj classes into CJS_Object classes

This CL removes the CJS_EmbedObj class and various subclasses and folds
the subclasses into their CJS_Object counterparts.

Change-Id: If6b882a4995c0b1bf83ac783f5c27ba9216c2d5c
Reviewed-on: https://pdfium-review.googlesource.com/25410
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

1 files changed, 23 insertions, 29 deletions

diff --git a/fxjs/cjs_util.h b/fxjs/cjs_util.h
index 1ed8405d46..0ad0fa101c 100644
--- a/fxjs/cjs_util.h
+++ b/fxjs/cjs_util.h
@@ -17,10 +17,30 @@
 #define UTIL_DOUBLE 1
 #define UTIL_STRING 2
 
-class util : public CJS_EmbedObj {
+class CJS_Util : public CJS_Object {
  public:
-  explicit util(CJS_Object* pJSObject);
-  ~util() override;
+  static void DefineJSObjects(CFXJS_Engine* pEngine);
+
+  explicit CJS_Util(v8::Local<v8::Object> pObject);
+  ~CJS_Util() override;
+
+  static WideString printx(const WideString& cFormat,
+                           const WideString& cSource);
+
+  JS_STATIC_METHOD(printd, CJS_Util);
+  JS_STATIC_METHOD(printf, CJS_Util);
+  JS_STATIC_METHOD(printx, CJS_Util);
+  JS_STATIC_METHOD(scand, CJS_Util);
+  JS_STATIC_METHOD(byteToChar, CJS_Util);
+
+ private:
+  friend class CJS_Util_ParseDataType_Test;
+
+  static int ObjDefnID;
+  static const char kName[];
+  static const JSMethodSpec MethodSpecs[];
+
+  static int ParseDataType(std::wstring* sFormat);
 
   CJS_Return printd(CJS_Runtime* pRuntime,
                     const std::vector<v8::Local<v8::Value>>& params);
@@ -32,32 +52,6 @@ class util : public CJS_EmbedObj {
                    const std::vector<v8::Local<v8::Value>>& params);
   CJS_Return byteToChar(CJS_Runtime* pRuntime,
                         const std::vector<v8::Local<v8::Value>>& params);
-
-  static WideString printx(const WideString& cFormat,
-                           const WideString& cSource);
-
- private:
-  friend class CJS_Util_ParseDataType_Test;
-
-  static int ParseDataType(std::wstring* sFormat);
-};
-
-class CJS_Util : public CJS_Object {
- public:
-  static void DefineJSObjects(CFXJS_Engine* pEngine);
-
-  explicit CJS_Util(v8::Local<v8::Object> pObject);
-  ~CJS_Util() override = default;
-
-  JS_STATIC_METHOD(printd, util);
-  JS_STATIC_METHOD(printf, util);
-  JS_STATIC_METHOD(printx, util);
-  JS_STATIC_METHOD(scand, util);
-  JS_STATIC_METHOD(byteToChar, util);
-
- private:
-  static int ObjDefnID;
-  static const JSMethodSpec MethodSpecs[];
 };
 
 #endif  // FXJS_CJS_UTIL_H_