2 files changed, 10 insertions, 8 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp
index d5cf3843e8..1929db7e8f 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "../../../testing/embedder_test.h"
+#include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FPDFParserEmbeddertest : public EmbedderTest {};
@@ -10,12 +10,12 @@ class FPDFParserEmbeddertest : public EmbedderTest {};
 TEST_F(FPDFParserEmbeddertest, LoadError_454695) {
   // Test a dictionary with hex string instead of correct content.
   // Verify that the defective pdf shouldn't be opened correctly.
-  EXPECT_FALSE(OpenDocument("testing/resources/bug_454695.pdf"));
+  EXPECT_FALSE(OpenDocument("bug_454695.pdf"));
 }
 
 TEST_F(FPDFParserEmbeddertest, Bug_481363) {
   // Test colorspace object with malformed dictionary.
-  EXPECT_TRUE(OpenDocument("testing/resources/bug_481363.pdf"));
+  EXPECT_TRUE(OpenDocument("bug_481363.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_NE(nullptr, page);
   UnloadPage(page);
@@ -23,7 +23,7 @@ TEST_F(FPDFParserEmbeddertest, Bug_481363) {
 
 TEST_F(FPDFParserEmbeddertest, Bug_544880) {
   // Test self referencing /Pages object.
-  EXPECT_TRUE(OpenDocument("testing/resources/bug_544880.pdf"));
+  EXPECT_TRUE(OpenDocument("bug_544880.pdf"));
   // Shouldn't crash. We don't check the return value here because we get the
   // the count from the "/Count 1" in the testcase (at the time of writing)
   // rather than the actual count (0).
@@ -31,6 +31,5 @@ TEST_F(FPDFParserEmbeddertest, Bug_544880) {
 }
 
 TEST_F(FPDFParserEmbeddertest, Feature_Linearized_Loading) {
-  EXPECT_TRUE(
-      OpenDocument("testing/resources/feature_linearized_loading.pdf", true));
+  EXPECT_TRUE(OpenDocument("feature_linearized_loading.pdf", true));
 }
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp
index 73b46b52c2..b86c20e9da 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp
@@ -6,6 +6,7 @@
 
 #include "../../../include/fpdfapi/fpdf_parser.h"
 #include "../../../include/fxcrt/fx_stream.h"
+#include "testing/utils/path_service.h"
 
 class CPDF_TestParser : public CPDF_Parser {
  public:
@@ -193,8 +194,10 @@ TEST(fpdf_parser_parser, ReadHexString) {
 
 TEST(fpdf_parser_parser, RebuildCrossRefCorrectly) {
   CPDF_TestParser parser;
-  ASSERT_TRUE(
-      parser.InitTest("testing/resources/parser_rebuildxref_correct.pdf"));
+  std::string test_file;
+  ASSERT_TRUE(PathService::GetTestFilePath("parser_rebuildxref_correct.pdf",
+                                           &test_file));
+  ASSERT_TRUE(parser.InitTest(test_file.c_str())) << test_file;
 
   ASSERT_TRUE(parser.RebuildCrossRef());
   const FX_FILESIZE offsets[] = {0, 15, 61, 154, 296, 374, 450};