Merge to XFA: Add path service to retrieve test data directory at run time so tests can be run from any directory.

Previously the tests which read test files assume the current directory is under pdfium. Running from any other directory will break the build.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1408003014 .

(cherry picked from commit c0e93a9a942fe7d99800502a61d2fbb58cf9276f)

Conflicts:
	core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp
	fpdfsdk/src/fpdfdoc_embeddertest.cpp
	testing/embedder_test.cpp
	testing/embedder_test.h

Review URL: https://codereview.chromium.org/1411403012 .

1 files changed, 7 insertions, 3 deletions

diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index ebd8c64b32..baaf016d9f 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.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 "embedder_test.h"
+#include "testing/embedder_test.h"
 
 #include <limits.h>
 
@@ -14,8 +14,9 @@
 #include "public/fpdf_dataavail.h"
 #include "public/fpdf_text.h"
 #include "public/fpdfview.h"
-#include "test_support.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "testing/test_support.h"
+#include "testing/utils/path_service.h"
 
 #ifdef PDF_ENABLE_V8
 #include "v8/include/v8.h"
@@ -97,7 +98,10 @@ void EmbedderTest::TearDown() {
 }
 
 bool EmbedderTest::OpenDocument(const std::string& filename) {
-  file_contents_ = GetFileContents(filename.c_str(), &file_length_);
+  std::string file_path;
+  if (!PathService::GetTestFilePath(filename, &file_path))
+    return false;
+  file_contents_ = GetFileContents(file_path.c_str(), &file_length_);
   if (!file_contents_)
     return false;