Added some enhancements to OCMock.

chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm

Index: chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm
diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm b/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm
index 4f06be4030120f4409c3eab03159b1392185210a..1dcaaa5224ff0370f4bac3260bb237cb1c24decd 100644
--- a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm
+++ b/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm
@@ -13,6 +13,7 @@
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "third_party/ocmock/gtest_support.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
+#import "third_party/ocmock/ocmock_extensions.h"
 
 namespace {
 
@@ -60,12 +61,9 @@ id CreateBrowserWindowControllerMock() {
   id delegate = [OCMockObject mockForClass:[BrowserWindowController class]];
   // Make conformsToProtocol return YES for @protocol(BrowserCommandExecutor)
   // to satisfy the DCHECK() in handleExtraKeyboardShortcut.
-  //
-  // TODO(akalin): Figure out how to replace OCMOCK_ANY below with
-  // @protocol(BrowserCommandExecutor) and have it work.
-  BOOL yes = YES;
-  [[[delegate stub] andReturnValue:OCMOCK_VALUE(yes)]
-    conformsToProtocol:OCMOCK_ANY];
+  [[[delegate stub] andReturnBool:YES]
+    conformsToProtocol:[OCMArg conformsToProtocol:
+                        @protocol(BrowserCommandExecutor)]];
   return delegate;
 }