Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: ppapi/tests/test_pdf.cc

Issue 735283002: Remove the assumption that test_pdf.cc is not sandboxed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/tests/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/test_pdf.cc
diff --git a/ppapi/tests/test_pdf.cc b/ppapi/tests/test_pdf.cc
index 11a35b173a1ef36dd62963b2662580b551cd0d7f..7b12785e9802ca4255aa7ae4adae488dd987a401 100644
--- a/ppapi/tests/test_pdf.cc
+++ b/ppapi/tests/test_pdf.cc
@@ -11,10 +11,6 @@
#include "ppapi/cpp/var.h"
#include "ppapi/tests/testing_instance.h"
-#ifdef V8_USE_EXTERNAL_STARTUP_DATA
-#include "gin/public/isolate_holder.h"
-#endif
-
REGISTER_TEST_CASE(PDF);
TestPDF::TestPDF(TestingInstance* instance)
@@ -55,18 +51,15 @@ std::string TestPDF::TestGetV8ExternalSnapshotData() {
const char* snapshot_data;
int natives_size;
int snapshot_size;
-#ifdef V8_USE_EXTERNAL_STARTUP_DATA
- bool loaded_ok = gin::IsolateHolder::LoadV8Snapshot();
- ASSERT_TRUE(loaded_ok);
+
pp::PDF::GetV8ExternalSnapshotData(instance_, &natives_data, &natives_size,
&snapshot_data, &snapshot_size);
+#ifdef V8_USE_EXTERNAL_STARTUP_DATA
ASSERT_NE(natives_data, (char*) (NULL));
ASSERT_NE(natives_size, 0);
ASSERT_NE(snapshot_data, (char*) (NULL));
ASSERT_NE(snapshot_size, 0);
#else
- pp::PDF::GetV8ExternalSnapshotData(instance_, &natives_data, &natives_size,
- &snapshot_data, &snapshot_size);
ASSERT_EQ(natives_data, (char*) (NULL));
ASSERT_EQ(natives_size, 0);
ASSERT_EQ(snapshot_data, (char*) (NULL));
« no previous file with comments | « ppapi/tests/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698