diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
| commit | 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c (patch) | |
| tree | 422e979cbfdeab9781c07a4040aee94a9dd0a7f6 /testing | |
| parent | ba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff) | |
| download | pdfium-chromium/2557.tar.xz | |
Fix all relative includes to third_party.chromium/2560chromium/2559chromium/2558chromium/2557
- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
BUG=541704
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425153006 .
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/embedder_test.cpp | 2 | ||||
| -rw-r--r-- | testing/embedder_test.h | 2 | ||||
| -rw-r--r-- | testing/test_support.cpp | 4 | ||||
| -rw-r--r-- | testing/test_support.h | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index 6151d73afd..1c0dda6be1 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -18,8 +18,8 @@ #include "testing/gmock/include/gmock/gmock.h" #ifdef PDF_ENABLE_V8 -#include "v8/include/libplatform/libplatform.h" #include "v8/include/v8.h" +#include "v8/include/v8-platform.h" #endif // PDF_ENABLE_V8 namespace { diff --git a/testing/embedder_test.h b/testing/embedder_test.h index 035906d6c9..31192b34aa 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -12,8 +12,8 @@ #include "../public/fpdf_ext.h" #include "../public/fpdf_formfill.h" #include "../public/fpdfview.h" -#include "../third_party/base/nonstd_unique_ptr.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/base/nonstd_unique_ptr.h" #ifdef PDF_ENABLE_V8 #include "v8/include/v8.h" diff --git a/testing/test_support.cpp b/testing/test_support.cpp index 49232990bc..8ecda30bce 100644 --- a/testing/test_support.cpp +++ b/testing/test_support.cpp @@ -13,6 +13,10 @@ #define PATH_SEPARATOR '/' #endif +#ifdef PDF_ENABLE_V8 +#include "v8/include/libplatform/libplatform.h" +#endif + namespace { #ifdef PDF_ENABLE_V8 diff --git a/testing/test_support.h b/testing/test_support.h index 4bb88db254..afa3bafc96 100644 --- a/testing/test_support.h +++ b/testing/test_support.h @@ -11,9 +11,8 @@ #include "../public/fpdfview.h" #ifdef PDF_ENABLE_V8 -#include "v8/include/libplatform/libplatform.h" #include "v8/include/v8.h" -#endif +#endif // PDF_ENABLE_V8 // Reads the entire contents of a file into a newly malloc'd buffer. char* GetFileContents(const char* filename, size_t* retlen); |