This is a (less ambitious) re-land of http://crrev.com/2852613002 which
was reverted due to content_browsertests crashes on ChromeOS. That CL is
a re-land of http://crrev.com/2779193002 which was reverted due to build
errors on Mac.

Instead of rolling Google Test to 1.8.0, this CL uses the last commit
before a breaking change was introduced. Details about the breakage are
in https://crbug.com/630705#c27 and https://crbug.com/630705#c28. It is
expected that rolling Google Test from there to the next usable version
will be much less disruptive.

GoogleTest (gtest) and GoogleMock (gmock) are now hosted into the same
googletest repository. In order to cope with this, the googletest
repository is now sourced at third_party/googletest.

The file/directory layout of Google Test is not yet considered stable.
To minimize disruption while Google Test stabilizes, Chromium code will
be insulated from third_party/googletest.

* testing/gtest/include/gtest/ and testing/gmock/include/gmock have
  been populated with headers that forward into the appropriate locations of
  third_party/googletest

* testing/BUILD.gn has been populated with the targets
  //testing/gtest(:gtest_main) and //testing/gmock(:gmock_main), which
  depend on the appropriate //third_party/googletest targets.

All Chromium code should keep depending on the targets and headers
in testing/{gtest,gmock} for now.

BUG=630705
TESTED=out/Default/content_browsertests --gtest_filter=MojoTest.Init
TESTED=ninja -C out/Default/ ced_unittests && ninja -C out/Default
TBR=rkc, dpranke

Review-Url: https://codereview.chromium.org/2856383002
Cr-Original-Commit-Position: refs/heads/master@{#469551}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 52e27a3d242ac0bbcbdc00683f6489ed4d8e9b3f
This commit is contained in:
pwnall 2017-05-04 17:44:27 -07:00 коммит произвёл Commit bot
Родитель 53a0336dc2
Коммит 7d06942a3d
2 изменённых файлов: 14 добавлений и 0 удалений

Просмотреть файл

@ -2,6 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Chromium's GN configuration for gmock now lives at testing/gmock/BUILD.gn.
#
# This configuration is left in the tree because it is pulled by V8 and PDFium,
# and will be removed as soon as the projects switch off of it.
#
# Details at http://crbug.com/630705 and http://crrev.com/2779193002
config("gmock_config") {
# Gmock headers need to be able to find themselves.
include_dirs = [

Просмотреть файл

@ -2,6 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Chromium's GN configuration for gtest now lives at testing/gtest/BUILD.gn.
#
# This configuration is left in the tree because it is pulled by V8 and PDFium,
# and will be removed as soon as the projects switch off of it.
#
# Details at http://crbug.com/630705 and http://crrev.com/2779193002
import("//build_overrides/gtest.gni")
if (is_ios) {
import("//build/config/ios/ios_sdk.gni")