WIP roll gtest/gmock DEPS

testing/gtest.gyp

Index: testing/gtest.gyp
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index e248bc1ba903d05528821cac75c0f2574ac0f127..050871e5b795768db96597bb2c8d7f657a6042b1 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -15,8 +15,8 @@
         '<@(gtest_sources)',
       ],
       'include_dirs': [
-        'gtest',
-        'gtest/include',
+        '../third_party/gtest/googletest',
+        '../third_party/gtest/googletest/include',
       ],
       'dependencies': [
         'gtest_prod',
@@ -28,7 +28,8 @@
       ],
       'all_dependent_settings': {
         'include_dirs': [
-          'gtest/include',
+          '.',  # Include testing/testing for backward compatibility during roll crbug/630705
+          '../third_party/gtest/googletest/include',
         ],
         'defines': [
           'GTEST_HAS_POSIX_RE=0',
@@ -157,10 +158,10 @@
       'target_name': 'gtest_main',
       'type': 'static_library',
       'dependencies': [
-        'gtest',
+        '../third_party/gtest/googletest',
       ],
       'sources': [
-        'gtest/src/gtest_main.cc',
+        '../third_party/gtest/googletest/src/gtest_main.cc',
       ],
     },
     {
@@ -168,7 +169,7 @@
       'toolsets': ['host', 'target'],
       'type': 'none',
       'sources': [
-        'gtest/include/gtest/gtest_prod.h',
+        '../third_party/gtest/googletest/include/gtest/gtest_prod.h',
       ],
     },
   ],