commit 4d3acf4ec42bf6e838f9060103aff98fbf170794
author Philip P. Moltmann <moltmann@google.com> Mon Mar 20 11:05:52 2017 -0700
committer Philip P. Moltmann <moltmann@google.com> Mon Mar 20 12:40:18 2017 -0700
tree f29cc648443acb7492d326da46aabaa1ed5b2a36
parent ecf04792773cf4ce99958ca692ddd078832bdce9

Update to bc8dcc3ede286fbcaac3f741c379297cffff0eea

Same version as used by Chromium 57.0.2987.108

Fixes: 28051413, 34337228
Test: cts-tradefed run cts-dev -m CtsGraphicsTestCases -t android.graphics.pdf.cts
      cts-tradefed run cts-dev -m Print -t android.print.pdf.cts
Change-Id: I1bf02cae444c9f08711953c4475af10db2becd58

testing/fx_string_testhelpers.h

diff --git a/testing/fx_string_testhelpers.h b/testing/fx_string_testhelpers.h
index 4dd37c6..82552d7 100644
--- a/testing/fx_string_testhelpers.h
+++ b/testing/fx_string_testhelpers.h
@@ -7,7 +7,7 @@
 
 #include <ostream>
 
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_string.h"
 
 // Output stream operator so GTEST macros work with FX strings.
 std::ostream& operator<<(std::ostream& out, const CFX_ByteStringC& str);
@@ -15,4 +15,4 @@
 std::ostream& operator<<(std::ostream& out, const CFX_WideStringC& str);
 std::ostream& operator<<(std::ostream& out, const CFX_WideString& str);
 
-#endif  // TESTING_FX_STR_TESTHELPERS_H_
+#endif  // TESTING_FX_STRING_TESTHELPERS_H_