Support for better integration between OCMock and gtest.

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
 #include "grit/theme_resources.h"
 #include "testing/gmock/include/gmock/gmock.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 "ui/base/resource/resource_bundle.h"
 
 using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;
 
 namespace {
 
 // Width of the field so that we don't have to ask |field_| for it all
@@ skipping 256 matching lines @@
   const NSRect bounds = [view_ bounds];
   const NSRect leftDecorationRect =
       [cell frameForDecoration:&mock_left_decoration_ inFrame:bounds];
 
   // |controlView| gets the tooltip for the left decoration.
   id controlView = [OCMockObject mockForClass:[AutocompleteTextField class]];
   [[controlView expect] addToolTip:tooltip forRect:leftDecorationRect];
 
   [cell updateToolTipsInRect:bounds ofView:controlView];
 
-  [controlView verify];
+  EXPECT_OCMOCK_VERIFY(controlView);
 }
 
 }  // namespace