Added some enhancements to OCMock.

chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_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 "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #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"
+#include "third_party/ocmock/ocmock_extensions.h"
 
 @interface OCMockObject(PreventRetainCycle)
 - (void)clearRecordersAndExpectations;
 @end
 
 @implementation OCMockObject(PreventRetainCycle)
 
 // We need a mechanism to clear the invocation handlers to break a
 // retain cycle (see below; search for "retain cycle").
 - (void)clearRecordersAndExpectations {
@@ skipping 17 matching lines @@
   }
 
   BrowserTestHelper helper_;
   const BookmarkNode* bmbNode_;
   base::mac::ScopedNSAutoreleasePool pool_;
 };
 
 TEST_F(BookmarkFolderTargetTest, StartWithNothing) {
   // Need a fake "button" which has a bookmark node.
   id sender = [OCMockObject mockForClass:[BookmarkButton class]];
-  [[[sender stub] andReturnValue:OCMOCK_VALUE(bmbNode_)] bookmarkNode];
+  [[[sender stub] andReturnPointer:bmbNode_] bookmarkNode];
 
   // Fake controller
   id controller = [OCMockObject mockForClass:[BookmarkBarFolderController
                                                class]];
   // No current folder
   [[[controller stub] andReturn:nil] folderController];
 
   // Make sure we get an addNew
   [[controller expect] addNewFolderControllerWithParentButton:sender];
 
   scoped_nsobject<BookmarkFolderTarget> target(
     [[BookmarkFolderTarget alloc] initWithController:controller]);
 
   [target openBookmarkFolderFromButton:sender];
   EXPECT_OCMOCK_VERIFY(controller);
 }
 
 TEST_F(BookmarkFolderTargetTest, ReopenSameFolder) {
   // Need a fake "button" which has a bookmark node.
   id sender = [OCMockObject mockForClass:[BookmarkButton class]];
-  [[[sender stub] andReturnValue:OCMOCK_VALUE(bmbNode_)] bookmarkNode];
+  [[[sender stub] andReturnPointer:bmbNode_] bookmarkNode];
 
   // Fake controller
   id controller = [OCMockObject mockForClass:[BookmarkBarFolderController
                                                class]];
   // YES a current folder.  Self-mock that as well, so "same" will be
   // true.  Note this creates a retain cycle in OCMockObject; we
   // accomodate at the end of this function.
   [[[controller stub] andReturn:controller] folderController];
   [[[controller stub] andReturn:sender] parentButton];
 
@@ skipping 10 matching lines @@
   // Our use of OCMockObject means an object can return itself.  This
   // creates a retain cycle, since OCMock retains all objects used in
   // mock creation.  Clear out the invocation handlers of all
   // OCMockRecorders we used to break the cycles.
   [controller clearRecordersAndExpectations];
 }
 
 TEST_F(BookmarkFolderTargetTest, ReopenNotSame) {
   // Need a fake "button" which has a bookmark node.
   id sender = [OCMockObject mockForClass:[BookmarkButton class]];
-  [[[sender stub] andReturnValue:OCMOCK_VALUE(bmbNode_)] bookmarkNode];
+  [[[sender stub] andReturnPointer:bmbNode_] bookmarkNode];
 
   // Fake controller
   id controller = [OCMockObject mockForClass:[BookmarkBarFolderController
                                                class]];
   // YES a current folder but NOT same.
   [[[controller stub] andReturn:controller] folderController];
   [[[controller stub] andReturn:nil] parentButton];
 
   // Insure the controller gets a chance to decide which folders to
   // close and open.
   [[controller expect] addNewFolderControllerWithParentButton:sender];
 
   scoped_nsobject<BookmarkFolderTarget> target(
     [[BookmarkFolderTarget alloc] initWithController:controller]);
 
   [target openBookmarkFolderFromButton:sender];
   EXPECT_OCMOCK_VERIFY(controller);
 
   // Break retain cycles.
   [controller clearRecordersAndExpectations];
 }