Update and move gmock and gtest.
Update to the version of googletest current in chromium. Googlemock has
merged into googletest so we get rid of the separate DEPs entry and point
everything inside googletest.
We put it in 'third_party' instead of 'testing' to prepare for the
upcoming stand-alone gn build which borrows chromium build files that
require other stuff in the 'testing' directory.
BUG=angleproject:1569
Change-Id: I51d1675efd5d0104bb6390721928010221a5d6fc
Reviewed-on: https://chromium-review.googlesource.com/713466
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
diff --git a/.gitignore b/.gitignore
index 3ca3f4d..5d65155 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,11 +21,10 @@
.gclient
.gclient_entries
/src/tests/third_party/gles_conformance_tests
-/testing/gmock
-/testing/gtest
/third_party/cherry
/third_party/deqp/src
/third_party/glslang-angle/src
+/third_party/googletest/src
/third_party/gyp
/third_party/libpng
/third_party/spirv-headers/src