Re-land: Roll gtest.

testing/gtest.gyp

Index: testing/gtest.gyp
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index ec8be2acf8e5c40e4568aecf38f12ff5983b090a..5998ccad7a588a21900f92210b0c0e835bce573e 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -15,8 +15,8 @@
         '<@(gtest_sources)',
       ],
       'include_dirs': [
-        'gtest',
-        'gtest/include',
+        'third_party/googletest/googletest',
+        'third_party/googletest/googletest/include',
       ],
       'dependencies': [
         'gtest_prod',
@@ -30,7 +30,7 @@
       ],
       'all_dependent_settings': {
         'include_dirs': [
-          'gtest/include',
+          'third_party/googletest/googletest/include',  # So that gtest headers can find themselves.
         ],
         'defines': [
           'GTEST_HAS_POSIX_RE=0',
@@ -162,7 +162,7 @@
         'gtest',
       ],
       'sources': [
-        'gtest/src/gtest_main.cc',
+        'third_party/googletest/googletest/src/gtest_main.cc',
       ],
     },
     {
@@ -171,6 +171,7 @@
       'type': 'none',
       'sources': [
         'gtest/include/gtest/gtest_prod.h',
+        'third_party/googletest/googletest/include/gtest/gtest_prod.h',
       ],
     },
   ],