Support for better integration between OCMock and gtest.

chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
===================================================================
--- chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm	(revision 85510)
+++ chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm	(working copy)
@@ -11,6 +11,7 @@
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
+#include "third_party/ocmock/gtest_support.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
 @interface OCMockObject(PreventRetainCycle)
@@ -64,7 +65,7 @@
     [[BookmarkFolderTarget alloc] initWithController:controller]);
 
   [target openBookmarkFolderFromButton:sender];
-  [controller verify];
+  EXPECT_OCMOCK_VERIFY(controller);
 }
 
 TEST_F(BookmarkFolderTargetTest, ReopenSameFolder) {
@@ -89,7 +90,7 @@
       [[BookmarkFolderTarget alloc] initWithController:controller]);
 
   [target openBookmarkFolderFromButton:sender];
-  [controller verify];
+  EXPECT_OCMOCK_VERIFY(controller);
 
   // Our use of OCMockObject means an object can return itself.  This
   // creates a retain cycle, since OCMock retains all objects used in
@@ -118,7 +119,7 @@
     [[BookmarkFolderTarget alloc] initWithController:controller]);
 
   [target openBookmarkFolderFromButton:sender];
-  [controller verify];
+  EXPECT_OCMOCK_VERIFY(controller);
 
   // Break retain cycles.
   [controller clearRecordersAndExpectations];