Support for better integration between OCMock and gtest.

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
===================================================================
--- chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm	(revision 85510)
+++ chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm	(working copy)
@@ -29,6 +29,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
+#include "third_party/ocmock/gtest_support.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #include "ui/base/theme_provider.h"
 
@@ -1569,7 +1570,7 @@
 
   // Restore, then confirm cancelTracking was called.
   [bar_ setButtonContextMenu:origMenu];
-  [fakeMenu verify];
+  ASSERT_TRUE(testing::mac::VerifyOCMock(fakeMenu));

[Mark Mentovai, 2011/05/16 22:16:38]

You’ve used ASSERT pretty consistently here. Any reason for that instead of
EXPECT?

[TVL, 2011/05/17 14:57:16]

Habit.  I've seen too many tests where something goes wrong, but it's all EXPECT
checks, so the rest of the test not only fails, but crashes, preventing the rest
of the unittests in the binary from running.  I'll go ahead and switch them to
EXCPECTs.

 }
 
 TEST_F(BookmarkBarControllerTest, CloseFolderOnAnimate) {