diff options
author | Lei Zhang <thestig@chromium.org> | 2017-12-20 19:40:50 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-20 19:40:50 +0000 |
commit | 208eecfa7850ced5c0d776b9e5df5b104428608f (patch) | |
tree | 7c5b94d642c37670ef3419ae922339c54d1742c5 /testing/embedder_test.h | |
parent | e75538b44dc0afd1951a29d4574a8bdb11ca336f (diff) | |
download | pdfium-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/embedder_test.h')
-rw-r--r-- | testing/embedder_test.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/testing/embedder_test.h b/testing/embedder_test.h index 87c1fad6f1..03155793c5 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -87,9 +87,16 @@ class EmbedderTest : public ::testing::Test, // environment, or return false on failure. // The filename is relative to the test data directory where we store all the // test files. - virtual bool OpenDocument(const std::string& filename, - const char* password = nullptr, - bool must_linearize = false); + // |password| can be nullptr if there is none. + virtual bool OpenDocumentWithOptions(const std::string& filename, + const char* password, + bool must_linearize); + + // Variants provided for convenience. + bool OpenDocument(const std::string& filename); + bool OpenDocumentLinearized(const std::string& filename); + bool OpenDocumentWithPassword(const std::string& filename, + const char* password); // Perform JavaScript actions that are to run at document open time. void DoOpenActions(); |