WIP roll gtest/gmock DEPS

testing/gmock.gyp

Index: testing/gmock.gyp
diff --git a/testing/gmock.gyp b/testing/gmock.gyp
index 6ef25665da33300923f8d60f9bfb54389e952143..2ce8eb6035ded390f8c67e77d5aa09012c3654fc 100644
--- a/testing/gmock.gyp
+++ b/testing/gmock.gyp
@@ -12,37 +12,38 @@
       ],
       'sources': [
         # Sources based on files in r173 of gmock.
-        'gmock/include/gmock/gmock-actions.h',
-        'gmock/include/gmock/gmock-cardinalities.h',
-        'gmock/include/gmock/gmock-generated-actions.h',
-        'gmock/include/gmock/gmock-generated-function-mockers.h',
-        'gmock/include/gmock/gmock-generated-matchers.h',
-        'gmock/include/gmock/gmock-generated-nice-strict.h',
-        'gmock/include/gmock/gmock-matchers.h',
-        'gmock/include/gmock/gmock-spec-builders.h',
-        'gmock/include/gmock/gmock.h',
-        'gmock/include/gmock/internal/gmock-generated-internal-utils.h',
-        'gmock/include/gmock/internal/gmock-internal-utils.h',
-        'gmock/include/gmock/internal/gmock-port.h',
-        'gmock/src/gmock-all.cc',
-        'gmock/src/gmock-cardinalities.cc',
-        'gmock/src/gmock-internal-utils.cc',
-        'gmock/src/gmock-matchers.cc',
-        'gmock/src/gmock-spec-builders.cc',
-        'gmock/src/gmock.cc',
+        '../third_party/gtest/googlemock/include/gmock/gmock-actions.h',
+        '../third_party/gtest/googlemock/include/gmock/gmock-cardinalities.h',
+        '../third_party/gtest/googlemock/include/gmock/gmock-generated-actions.h',
+        '../third_party/gtest/googlemock/include/gmock/gmock-generated-function-mockers.h',
+        '../third_party/gtest/googlemock/include/gmock/gmock-generated-matchers.h',
+        '../third_party/gtest/googlemock/include/gmock/gmock-generated-nice-strict.h',
+        '../third_party/gtest/googlemock/include/gmock/gmock-matchers.h',
+        '../third_party/gtest/googlemock/include/gmock/gmock-spec-builders.h',
+        '../third_party/gtest/googlemock/include/gmock/gmock.h',
+        '../third_party/gtest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h',
+        '../third_party/gtest/googlemock/include/gmock/internal/gmock-internal-utils.h',
+        '../third_party/gtest/googlemock/include/gmock/internal/gmock-port.h',
+        '../third_party/gtest/googlemock/src/gmock-all.cc',
+        '../third_party/gtest/googlemock/src/gmock-cardinalities.cc',
+        '../third_party/gtest/googlemock/src/gmock-internal-utils.cc',
+        '../third_party/gtest/googlemock/src/gmock-matchers.cc',
+        '../third_party/gtest/googlemock/src/gmock-spec-builders.cc',
+        '../third_party/gtest/googlemock/src/gmock.cc',
         'gmock_mutant.h',  # gMock helpers
       ],
       'sources!': [
-        'gmock/src/gmock-all.cc',  # Not needed by our build.
+        '../third_party/gtest/googlemock/src/gmock-all.cc',  # Not needed by our build.
       ],
       'include_dirs': [
         'gmock_custom',
-        'gmock/include',
+        '../third_party/gtest/googlemock/include',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           'gmock_custom',
-          'gmock/include',  # So that gmock headers can find themselves.
+          '.',  # Include testing/testing for backward compatibility during roll crbug/630705
+          '../third_party/gtest/googlemock/include',  # So that gmock headers can find themselves.
         ],
       },
       'export_dependent_settings': [
@@ -61,7 +62,7 @@
         'gmock',
       ],
       'sources': [
-        'gmock/src/gmock_main.cc',
+        '../third_party/gtest/googlemock/src/gmock_main.cc',
       ],
     },
   ],