From 208eecfa7850ced5c0d776b9e5df5b104428608f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 20 Dec 2017 19:40:50 +0000 Subject: Avoid default arguments in EmbedderTest::OpenDocument(). 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 Reviewed-by: Henrique Nakashima --- testing/xfa_js_embedder_test.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'testing/xfa_js_embedder_test.cpp') 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(); -- cgit v1.2.3