Revert of Roll googletest to 1.8.0. (patchset chromium#3 id:40001 of h…

…ttps://codereview.chromium.org/2852613002/ )

Reason for revert:
Seems to have caused all content_browsertests on ChromiumOS to crash.

https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29/builds/25582

I'll run the revert through trybots so that it doesn't break anything else.

Original issue's description:
> Roll googletest to 1.8.0.
>
> This is a re-land of http://crrev.com/2779193002 which was reverted due to
> build errors on Mac.
>
> 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=ninja -C out/Default/ ced_unittests && ninja -C out/Default
> TBR=rkc,dpranke,agl
>
> Review-Url: https://codereview.chromium.org/2852613002
> Cr-Commit-Position: refs/heads/master@{#468860}
> Committed: https://chromium.googlesource.com/chromium/src/+/dbcef9bdc1edd32d62c6de0bd382cdc78ce385da

TBR=dpranke@chromium.org,thakis@chromium.org,rkc@chromium.org,agl@chromium.org,pwnall@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=630705

Review-Url: https://codereview.chromium.org/2856963003
Cr-Commit-Position: refs/heads/master@{#468934}

.gitignore

@@ -269,6 +269,8 @@ vs-chromium-project.txt
 /sql/sql_unittests_run.xml
 /sync/sync.xml
 /sync_testserver.log
+/testing/gmock
+/testing/gtest
 /testserver.log
 /tools/luci-go/linux64/isolate
 /tools/luci-go/mac64/isolate

DEPS

@@ -132,6 +132,12 @@ deps = {
   'src/sdch/open-vcdiff':
     Var('chromium_git') + '/external/github.com/google/open-vcdiff.git' + '@' + '2b9bd1fe548520e9355e457a134bab7e2f9c56c0',
 
+  'src/testing/gtest':
+    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
+
+  'src/testing/gmock':
+    Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
+
   'src/third_party/freetype/src':
     Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + Var('freetype_revision'),
 
@@ -150,9 +156,6 @@ deps = {
   'src/third_party/colorama/src':
     Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
 
-  'src/third_party/googletest/src':
-    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'ec44c6c1675c25b9827aacd08c02433cccde7780',
-
   'src/third_party/icu':
     Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'b34251f8b762f8e2112a89c587855ca4297fed96',
 

base/gtest_prod_util.h

@@ -5,7 +5,7 @@
 #ifndef BASE_GTEST_PROD_UTIL_H_
 #define BASE_GTEST_PROD_UTIL_H_
 
-#include "testing/gtest/include/gtest/gtest_prod.h"  // nogncheck
+#include "testing/gtest/include/gtest/gtest_prod.h"
 
 // This is a wrapper for gtest's FRIEND_TEST macro that friends
 // test with all possible prefixes. This is very helpful when changing the test

build/secondary/testing/gmock/BUILD.gn

@@ -2,13 +2,6 @@
 # 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 = [

build/secondary/testing/gtest/BUILD.gn

@@ -2,13 +2,6 @@
 # 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")
 
 config("gtest_config") {

device/bluetooth/dbus/fake_bluetooth_media_endpoint_service_provider.h

@@ -14,7 +14,7 @@
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_export.h"
 #include "device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"  // nogncheck
+#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace bluez {
 

net/socket/sequenced_socket_data_unittest.cc

@@ -671,8 +671,8 @@ TEST_F(SequencedSocketDataTest, SingleSyncWriteTooSmall) {
 
   static const char* kExpectedFailures[] = {
       "Expected: (data.length()) >= (expected_data.length())",
-      "To be equal to: actual_data",
-      "To be equal to: sock_->Write(buf.get(), len, failing_callback_)"};
+      "Value of: actual_data",
+      "Value of: sock_->Write(buf.get(), len, failing_callback_)"};
   ASSERT_EQ(arraysize(kExpectedFailures),
             static_cast<size_t>(gtest_failures.size()));
 

third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h → testing/gmock_custom/gmock/internal/custom/gmock-port.h

@@ -14,12 +14,14 @@ namespace std {
 // <20120322 below implies pre-4.7.0. In addition we blacklist several version
 // that released after 4.7.0 from pre-4.7.0 branch. 20120702 implies 4.5.4, and
 // 20121127 implies 4.6.4.
-#if defined(__GLIBCXX__) &&                               \
-    (__GLIBCXX__ < 20120322 || __GLIBCXX__ == 20120702 || \
-     __GLIBCXX__ == 20121127)
+#if defined(__GLIBCXX__) &&   \
+  (__GLIBCXX__ < 20120322 ||  \
+   __GLIBCXX__ == 20120702 || \
+   __GLIBCXX__ == 20121127)
 template <typename T>
 using is_default_constructible = std::is_constructible<T>;
 #endif
+
 }
 
 #endif  // TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_

testing/gtest_mac.h

@@ -5,8 +5,8 @@
 #ifndef TESTING_GTEST_MAC_H_
 #define TESTING_GTEST_MAC_H_
 
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h"
+#include <gtest/internal/gtest-port.h>
+#include <gtest/gtest.h>
 
 #ifdef GTEST_OS_MAC
 

testing/gtest_mac.mm

@@ -6,9 +6,9 @@
 
 #include <string>
 
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h"
-#include "third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h"
+#include <gtest/gtest.h>
+#include <gtest/internal/gtest-port.h>
+#include <gtest/internal/gtest-string.h>
 
 #ifdef GTEST_OS_MAC
 

testing/gtest_mac_unittest.mm

@@ -12,7 +12,7 @@
 
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h"
+#include "testing/gtest/include/gtest/internal/gtest-port.h"
 
 TEST(GTestMac, ExpectNSEQ) {
   base::mac::ScopedNSAutoreleasePool pool;

third_party/.gitignore

@@ -66,7 +66,6 @@
 /google_appengine_cloudstorage
 /google_toolbox_for_mac/src
 /googlemac
-/googletest/src
 /gvr-android-sdk/common_library.aar
 /gvr-android-sdk/test-libraries/controller_test_api.aar
 /gvr-android-sdk/libgvr_shim_static_arm.a