From 2785fb46249df5229e057917e54fe161bb0e3517 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 3 Mar 2015 09:49:29 -0800 Subject: Fix pdfium_embeddertests on XFA. Required to avoid a DCHECK() due to recent changes in V8 initialization. This mirrors the changes introduced at b045ed21 to pdfium_test.cpp in pdfium_embeddertest.cpp R=jam@chromium.org Review URL: https://codereview.chromium.org/969243002 --- testing/embedder_test.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'testing/embedder_test.cpp') diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index ffe51192af..cf0bdf892c 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -19,6 +19,7 @@ #include "../core/include/fxcrt/fx_system.h" #include "testing/gmock/include/gmock/gmock.h" #include "v8/include/v8.h" +#include "v8/include/libplatform/libplatform.h" #ifdef _WIN32 #define snprintf _snprintf @@ -193,6 +194,9 @@ EmbedderTest::~EmbedderTest() { void EmbedderTest::SetUp() { v8::V8::InitializeICU(); + v8::Platform* platform = v8::platform::CreateDefaultPlatform(); + v8::V8::InitializePlatform(platform); + v8::V8::Initialize(); #ifdef V8_USE_EXTERNAL_STARTUP_DATA ASSERT_TRUE(GetExternalData(g_exe_path_, "natives_blob.bin", &natives_)); @@ -226,6 +230,7 @@ void EmbedderTest::TearDown() { if (file_contents_) { free(file_contents_); } + v8::V8::ShutdownPlatform(); } bool EmbedderTest::OpenDocument(const std::string& filename) { -- cgit v1.2.3