diff options
author | Lei Zhang <thestig@chromium.org> | 2018-03-22 05:19:14 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-22 05:19:14 +0000 |
commit | c5514276094022c62373a8a908f72754366d15e8 (patch) | |
tree | 933bb996873663c41af2bc6e6a506b6e12c93c54 /testing/gtest/include | |
parent | 0ad1b2e3e8e0f3bb22c5b96a9cfc9a3d011a56df (diff) | |
download | pdfium-c5514276094022c62373a8a908f72754366d15e8.tar.xz |
Update gtest and gmock to 1.8.x.
This applies parts of https://crrev.com/469551 and
https://crrev.com/471303 to PDFium.
Change-Id: Ifbb8e4c300bd276fe3c6fe60d19ebb1618be8936
Reviewed-on: https://pdfium-review.googlesource.com/28791
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'testing/gtest/include')
-rw-r--r-- | testing/gtest/include/gtest/DEPS | 4 | ||||
-rw-r--r-- | testing/gtest/include/gtest/gtest.h | 10 | ||||
-rw-r--r-- | testing/gtest/include/gtest/gtest_prod.h | 10 |
3 files changed, 24 insertions, 0 deletions
diff --git a/testing/gtest/include/gtest/DEPS b/testing/gtest/include/gtest/DEPS new file mode 100644 index 0000000000..eb5e079aed --- /dev/null +++ b/testing/gtest/include/gtest/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + '+third_party/googletest/src/googletest/include/gtest', +] + diff --git a/testing/gtest/include/gtest/gtest.h b/testing/gtest/include/gtest/gtest.h new file mode 100644 index 0000000000..9425b25c15 --- /dev/null +++ b/testing/gtest/include/gtest/gtest.h @@ -0,0 +1,10 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// The file/directory layout of Google Test is not yet considered stable. Until +// it stabilizes, Chromium code will use forwarding headers in testing/gtest +// and testing/gmock, instead of directly including files in +// third_party/googletest. + +#include "third_party/googletest/src/googletest/include/gtest/gtest.h" diff --git a/testing/gtest/include/gtest/gtest_prod.h b/testing/gtest/include/gtest/gtest_prod.h new file mode 100644 index 0000000000..2d67b42013 --- /dev/null +++ b/testing/gtest/include/gtest/gtest_prod.h @@ -0,0 +1,10 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// The file/directory layout of Google Test is not yet considered stable. Until +// it stabilizes, Chromium code will use forwarding headers in testing/gtest +// and testing/gmock, instead of directly including files in +// third_party/googletest. + +#include "third_party/googletest/src/googletest/include/gtest/gtest_prod.h" |