Moved a whole pile of unittests over to CocoaTest.

chrome/browser/cocoa/location_bar_view_mac_unittest.mm

 // Copyright (c) 2009 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 "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/cocoa/autocomplete_text_field.h"
 #include "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
@@ skipping 41 matching lines @@
             ASCIIToWide("http://example.com/"));
 
   [field_ setStringValue:@"https://www.example.com"];
   EXPECT_EQ(locationBarView_->GetInputString(),
             ASCIIToWide("https://www.example.com/"));
 }
 #endif
 
 namespace {
 
-class LocationBarViewMacTest : public PlatformTest {
+class LocationBarViewMacTest : public CocoaTest {
  public:
   LocationBarViewMacTest() {
     // Make sure this is wide enough to play games with the cell
     // decorations.
     NSRect frame = NSMakeRect(0, 0, 400.0, 30);
-    field_.reset([[AutocompleteTextField alloc] initWithFrame:frame]);
+    scoped_nsobject<AutocompleteTextField> field(
+        [[AutocompleteTextField alloc] initWithFrame:frame]);
+    field_ = field.get();
     [field_ setStringValue:@"Testing"];
-    [cocoa_helper_.contentView() addSubview:field_.get()];
+    [[test_window() contentView] addSubview:field_];
   }
 
-  CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   BrowserTestHelper helper_;
-  scoped_nsobject<AutocompleteTextField> field_;
+  AutocompleteTextField* field_;
 };
 
 TEST_F(LocationBarViewMacTest, OnChangedImpl) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
   NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
 
   const std::wstring kKeyword(L"Google");
   const NSString* kSearchHint = @"Type to search";
   const NSString* kKeywordPrefix = @"Press ";
   const NSString* kKeywordSuffix = @" to search Google";
   const NSString* kKeywordString = @"Search Google:";
   // 0x2026 is Unicode ellipses.
   const NSString* kPartialString =
       [NSString stringWithFormat:@"Search Go%C:", 0x2026];
 
   // With no special hints requested, none set.
   LocationBarViewMac::OnChangedImpl(
-      field_.get(), std::wstring(), std::wstring(), false, false, image);
+      field_, std::wstring(), std::wstring(), false, false, image);
   EXPECT_FALSE([cell keywordString]);
   EXPECT_FALSE([cell hintString]);
 
   // Request only a search hint.
   LocationBarViewMac::OnChangedImpl(
-      field_.get(), std::wstring(), std::wstring(), false, true, image);
+      field_, std::wstring(), std::wstring(), false, true, image);
   EXPECT_FALSE([cell keywordString]);
   EXPECT_TRUE([[[cell hintString] string] isEqualToString:kSearchHint]);
 
   // Request a keyword hint, same results whether |search_hint|
   // parameter is true or false.
   LocationBarViewMac::OnChangedImpl(
-      field_.get(), kKeyword, kKeyword, true, true, image);
+      field_, kKeyword, kKeyword, true, true, image);
   EXPECT_FALSE([cell keywordString]);
   EXPECT_TRUE([[[cell hintString] string] hasPrefix:kKeywordPrefix]);
   EXPECT_TRUE([[[cell hintString] string] hasSuffix:kKeywordSuffix]);
   LocationBarViewMac::OnChangedImpl(
-      field_.get(), kKeyword, kKeyword, true, false, image);
+      field_, kKeyword, kKeyword, true, false, image);
   EXPECT_FALSE([cell keywordString]);
   EXPECT_TRUE([[[cell hintString] string] hasPrefix:kKeywordPrefix]);
   EXPECT_TRUE([[[cell hintString] string] hasSuffix:kKeywordSuffix]);
 
   // Request keyword-search mode, same results whether |search_hint|
   // parameter is true or false.
   LocationBarViewMac::OnChangedImpl(
-      field_.get(), kKeyword, kKeyword, false, true, image);
+      field_, kKeyword, kKeyword, false, true, image);
   EXPECT_TRUE([[[cell keywordString] string] isEqualToString:kKeywordString]);
   EXPECT_FALSE([cell hintString]);
   LocationBarViewMac::OnChangedImpl(
-      field_.get(), kKeyword, kKeyword, false, false, image);
+      field_, kKeyword, kKeyword, false, false, image);
   EXPECT_TRUE([[[cell keywordString] string] isEqualToString:kKeywordString]);
   EXPECT_FALSE([cell hintString]);
 
   // Check that a partial keyword-search string is passed down in case
   // the view is narrow.
   // TODO(shess): Is this test a good argument for re-writing using a
   // mock field?
   NSRect frame([field_ frame]);
   frame.size.width = 10.0;
   [field_ setFrame:frame];
   LocationBarViewMac::OnChangedImpl(
-      field_.get(), kKeyword, kKeyword, false, true, image);
+      field_, kKeyword, kKeyword, false, true, image);
   EXPECT_TRUE([[[cell keywordString] string] isEqualToString:kPartialString]);
   EXPECT_FALSE([cell hintString]);
 
   // Transition back to baseline.
   LocationBarViewMac::OnChangedImpl(
-      field_.get(), std::wstring(), std::wstring(), false, false, image);
+      field_, std::wstring(), std::wstring(), false, false, image);
   EXPECT_FALSE([cell keywordString]);
   EXPECT_FALSE([cell hintString]);
 }
 
 }  // namespace