Merge to XFA: Don't call FPDF_InitLibrary() in individual unit_tests.

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

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

3 files changed, 9 insertions, 9 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 3bbd94c680..7f6bcc1682 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1552,7 +1552,6 @@ static_library("xfa") {
 
 test("pdfium_unittests") {
   sources = [
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp",
     "core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp",
     "core/src/fxcrt/fx_basic_bstring_unittest.cpp",
     "core/src/fxcrt/fx_basic_wstring_unittest.cpp",
@@ -1572,6 +1571,7 @@ test("pdfium_unittests") {
 
 test("pdfium_embeddertests") {
   sources = [
+    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp",
     "fpdfsdk/src/fpdf_dataavail_embeddertest.cpp",
     "fpdfsdk/src/fpdfdoc_embeddertest.cpp",
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
index 18196a19a0..2769f3c14f 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
@@ -7,10 +7,14 @@
 
 #include "../../../../fpdfsdk/include/fpdfview.h"
 #include "../../../../testing/fx_string_testhelpers.h"
-#include "../../../include/fxcrt/fx_basic.h"
 #include "../../../include/fpdfapi/fpdf_parser.h"
+#include "../../../include/fxcrt/fx_basic.h"
+#include "../../../testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+class FPDFParserDecodeEmbeddertest : public EmbedderTest {
+};
+
 // NOTE: python's zlib.compress() and zlib.decompress() may be useful for
 // external validation of the FlateEncode/FlateDecode test cases.
 
@@ -18,7 +22,7 @@
   { (const unsigned char*)input_literal, sizeof(input_literal) - 1, \
     (const unsigned char*)expected_literal, sizeof(expected_literal) - 1 }
 
-TEST(ParserDecode, FlateEncode) {
+TEST_F(FPDFParserDecodeEmbeddertest, FlateEncode) {
   struct FlateEncodeCase {
     const unsigned char* input;
     unsigned int input_size;
@@ -42,7 +46,6 @@ TEST(ParserDecode, FlateEncode) {
               ),
   };
 
-  FPDF_InitLibrary();
   for (size_t i = 0; i < FX_ArraySize(flate_encode_cases); ++i) {
     FlateEncodeCase* ptr = &flate_encode_cases[i];
     unsigned char* result;
@@ -52,10 +55,9 @@ TEST(ParserDecode, FlateEncode) {
               std::string((const char*)result, result_size))
         << " for case " << i;
   }
-  FPDF_DestroyLibrary();
 }
 
-TEST(ParserDecode, FlateDecode) {
+TEST_F(FPDFParserDecodeEmbeddertest, FlateDecode) {
   struct FlateDecodeCase {
     const unsigned char* input;
     unsigned int input_size;
@@ -81,7 +83,6 @@ TEST(ParserDecode, FlateDecode) {
               ),
   };
 
-  FPDF_InitLibrary();
   for (size_t i = 0; i < FX_ArraySize(flate_decode_cases); ++i) {
     FlateDecodeCase* ptr = &flate_decode_cases[i];
     unsigned char* result;
@@ -91,7 +92,6 @@ TEST(ParserDecode, FlateDecode) {
               std::string((const char*)result, result_size))
         << " for case " << i;
   }
-  FPDF_DestroyLibrary();
 }
 
 
diff --git a/pdfium.gyp b/pdfium.gyp
index 56d33b5405..b84647ce1b 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -919,7 +919,6 @@
         '<(DEPTH)'
       ],
       'sources': [
-        'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp',
         'core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp',
         'core/src/fxcrt/fx_basic_bstring_unittest.cpp',
         'core/src/fxcrt/fx_basic_wstring_unittest.cpp',
@@ -943,6 +942,7 @@
         '<(DEPTH)/v8/include',
       ],
       'sources': [
+        'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp',
         'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp',
         'fpdfsdk/src/fpdf_dataavail_embeddertest.cpp',
         'fpdfsdk/src/fpdfdoc_embeddertest.cpp',