Support for better integration between OCMock and gtest.

third_party/ocmock/ocmock.gyp

Index: third_party/ocmock/ocmock.gyp
===================================================================
--- third_party/ocmock/ocmock.gyp	(revision 85510)
+++ third_party/ocmock/ocmock.gyp	(working copy)
@@ -11,35 +11,43 @@
         {
           'target_name' : 'ocmock',
           'type': '<(library)',
-          'include_dirs':[ '.',],
+          'include_dirs': [ '.', '../..', ],
           'direct_dependent_settings': {
             'include_dirs': [ '.', ],
           },
+          'dependencies': [
+            '../../testing/gtest.gyp:gtest',
+          ],
           'sources': [
+            # Helper for using with gtest.
+            'gtest_support.h',
+            'gtest_support.mm',
+
+            # OCMock sources.
             'OCMock/NSInvocation+OCMAdditions.h',
             'OCMock/OCMObserverRecorder.m',
             'OCMock/NSInvocation+OCMAdditions.m',
-            'OCMock/NSMethodSignature+OCMAdditions.h',	
-            'OCMock/NSMethodSignature+OCMAdditions.m',	
-            'OCMock/NSNotificationCenter+OCMAdditions.h',	
-            'OCMock/NSNotificationCenter+OCMAdditions.m',	
-            'OCMock/OCClassMockObject.h',			
-            'OCMock/OCClassMockObject.m',			
-            'OCMock/OCMArg.h',				
-            'OCMock/OCMArg.m',				
+            'OCMock/NSMethodSignature+OCMAdditions.h',
+            'OCMock/NSMethodSignature+OCMAdditions.m',
+            'OCMock/NSNotificationCenter+OCMAdditions.h',
+            'OCMock/NSNotificationCenter+OCMAdditions.m',
+            'OCMock/OCClassMockObject.h',
+            'OCMock/OCClassMockObject.m',
+            'OCMock/OCMArg.h',
+            'OCMock/OCMArg.m',
             'OCMock/OCMBlockCaller.h',
             'OCMock/OCMBlockCaller.m',
-            'OCMock/OCMBoxedReturnValueProvider.h',		
-            'OCMock/OCMBoxedReturnValueProvider.m',		
-            'OCMock/OCMConstraint.h',				
-            'OCMock/OCMConstraint.m',				
-            'OCMock/OCMExceptionReturnValueProvider.h',	
-            'OCMock/OCMExceptionReturnValueProvider.m',	
-            'OCMock/OCMIndirectReturnValueProvider.h',	
-            'OCMock/OCMIndirectReturnValueProvider.m',	
-            'OCMock/OCMNotificationPoster.h',			
-            'OCMock/OCMNotificationPoster.m',			
-            'OCMock/OCMObserverRecorder.h',			
+            'OCMock/OCMBoxedReturnValueProvider.h',
+            'OCMock/OCMBoxedReturnValueProvider.m',
+            'OCMock/OCMConstraint.h',
+            'OCMock/OCMConstraint.m',
+            'OCMock/OCMExceptionReturnValueProvider.h',
+            'OCMock/OCMExceptionReturnValueProvider.m',
+            'OCMock/OCMIndirectReturnValueProvider.h',
+            'OCMock/OCMIndirectReturnValueProvider.m',
+            'OCMock/OCMNotificationPoster.h',
+            'OCMock/OCMNotificationPoster.m',
+            'OCMock/OCMObserverRecorder.h',
             'OCMock/OCMPassByRefSetter.h',
             'OCMock/OCMPassByRefSetter.m',
             'OCMock/OCMRealObjectForwarder.h',