Added some enhancements to OCMock.

chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <Carbon/Carbon.h>
 
 #include "base/debug/debugger.h"
 #include "base/memory/scoped_nsobject.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_frame_view.h"
 #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 {
 
 NSEvent* KeyEvent(const NSUInteger flags, const NSUInteger keyCode) {
   return [NSEvent keyEventWithType:NSKeyDown
                           location:NSZeroPoint
                      modifierFlags:flags
                          timestamp:0.0
                       windowNumber:0
                            context:nil
@@ skipping 27 matching lines @@
     CocoaTest::TearDown();
   }
 
   ChromeEventProcessingWindow* window_;
 };
 
 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;
 }
 
 // Verify that the window intercepts a particular key event and
 // forwards it to [delegate executeCommand:].  Assume that other
 // CommandForKeyboardShortcut() will work the same for the rest.
 TEST_F(ChromeEventProcessingWindowTest,
        PerformKeyEquivalentForwardToExecuteCommand) {
   NSEvent* event = KeyEvent(NSCommandKeyMask, kVK_ANSI_1);
 
@@ skipping 19 matching lines @@
 
   [window_ setDelegate:delegate];
   [window_ performKeyEquivalent:event];
 
   // Don't wish to mock all the way down...
   [window_ setDelegate:nil];
   EXPECT_OCMOCK_VERIFY(delegate);
 }
 
 }  // namespace