summaryrefslogtreecommitdiff
path: root/testing/xfa_js_embedder_test.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-12-20 19:40:50 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-12-20 19:40:50 +0000
commit208eecfa7850ced5c0d776b9e5df5b104428608f (patch)
tree7c5b94d642c37670ef3419ae922339c54d1742c5 /testing/xfa_js_embedder_test.cpp
parente75538b44dc0afd1951a29d4574a8bdb11ca336f (diff)
downloadpdfium-208eecfa7850ced5c0d776b9e5df5b104428608f.tar.xz
Avoid default arguments in EmbedderTest::OpenDocument().chromium/3300
Default arguments are banned on virtual functions. Remove default arguments and rename OpenDocument() to OpenDocumentWithOptions(). Add wrappers for OpenDocumentWithOptions() to call it with sensible options. Change-Id: I4955d88cf77a7eab1771692ea3d6a18260b52900 Reviewed-on: https://pdfium-review.googlesource.com/21891 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'testing/xfa_js_embedder_test.cpp')
-rw-r--r--testing/xfa_js_embedder_test.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/testing/xfa_js_embedder_test.cpp b/testing/xfa_js_embedder_test.cpp
index db297292c6..d007c87f65 100644
--- a/testing/xfa_js_embedder_test.cpp
+++ b/testing/xfa_js_embedder_test.cpp
@@ -22,14 +22,14 @@ void XFAJSEmbedderTest::SetUp() {
v8::Isolate::CreateParams params;
params.array_buffer_allocator = array_buffer_allocator_.get();
isolate_ = v8::Isolate::New(params);
- ASSERT_TRUE(isolate_ != nullptr);
+ ASSERT_TRUE(isolate_);
EmbedderTest::SetExternalIsolate(isolate_);
EmbedderTest::SetUp();
}
void XFAJSEmbedderTest::TearDown() {
- value_ = nullptr;
+ value_.reset();
script_context_ = nullptr;
EmbedderTest::TearDown();
@@ -42,10 +42,11 @@ CXFA_Document* XFAJSEmbedderTest::GetXFADocument() {
return UnderlyingFromFPDFDocument(document())->GetXFADoc()->GetXFADoc();
}
-bool XFAJSEmbedderTest::OpenDocument(const std::string& filename,
- const char* password,
- bool must_linearize) {
- if (!EmbedderTest::OpenDocument(filename, password, must_linearize))
+bool XFAJSEmbedderTest::OpenDocumentWithOptions(const std::string& filename,
+ const char* password,
+ bool must_linearize) {
+ if (!EmbedderTest::OpenDocumentWithOptions(filename, password,
+ must_linearize))
return false;
script_context_ = GetXFADocument()->GetScriptContext();