From a8a28e0702a1874d29d3c9f2b155bce1557eb4fd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Mar 2016 15:41:39 -0400 Subject: Move core/include/fxcrt to core/fxcrt/include. This CL moves the fxcrt code into the core/fxcrt directory. The only exception was fx_bidi.h which was moved into core/fxcrt as it is not used outside of core/. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1825953002 . --- testing/DEPS | 1 + testing/fx_string_testhelpers.h | 2 +- testing/libfuzzer/pdf_fm2js_fuzzer.cc | 4 ++-- testing/libfuzzer/pdf_xml_fuzzer.cc | 4 ++-- testing/utils/path_service.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'testing') diff --git a/testing/DEPS b/testing/DEPS index ce8bbe45f7..99f34dc190 100644 --- a/testing/DEPS +++ b/testing/DEPS @@ -1,6 +1,7 @@ include_rules = [ '+core/include', '+core/fxcodec', + '+core/fxcrt/include', '+fpdfsdk/include', '+public', '+v8', diff --git a/testing/fx_string_testhelpers.h b/testing/fx_string_testhelpers.h index d5a45f8635..a47242805f 100644 --- a/testing/fx_string_testhelpers.h +++ b/testing/fx_string_testhelpers.h @@ -7,7 +7,7 @@ #include -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" // Output stream operator so GTEST macros work with FX strings. std::ostream& operator<<(std::ostream& out, const CFX_ByteStringC& str); diff --git a/testing/libfuzzer/pdf_fm2js_fuzzer.cc b/testing/libfuzzer/pdf_fm2js_fuzzer.cc index acbbf8fd94..569c1291af 100644 --- a/testing/libfuzzer/pdf_fm2js_fuzzer.cc +++ b/testing/libfuzzer/pdf_fm2js_fuzzer.cc @@ -5,8 +5,8 @@ #include #include -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_string.h" #include "xfa/fxfa/fm2js/xfa_program.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { diff --git a/testing/libfuzzer/pdf_xml_fuzzer.cc b/testing/libfuzzer/pdf_xml_fuzzer.cc index 50187e6874..592bf0f066 100644 --- a/testing/libfuzzer/pdf_xml_fuzzer.cc +++ b/testing/libfuzzer/pdf_xml_fuzzer.cc @@ -7,8 +7,8 @@ #include #include -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_system.h" #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_parser_imp.h" diff --git a/testing/utils/path_service.cpp b/testing/utils/path_service.cpp index c5a461315c..9b2657406d 100644 --- a/testing/utils/path_service.cpp +++ b/testing/utils/path_service.cpp @@ -15,7 +15,7 @@ #include -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" // static bool PathService::EndsWithSeparator(const std::string& path) { -- cgit v1.2.3