Moved a whole pile of unittests over to CocoaTest.

chrome/browser/cocoa/clear_browsing_data_controller_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
-class ClearBrowsingDataControllerTest : public PlatformTest {
+class ClearBrowsingDataControllerTest : public CocoaTest {
  public:
-  ClearBrowsingDataControllerTest() {
+  virtual void SetUp() {
+    CocoaTest::SetUp();
     // Set up some interesting prefs:
     PrefService* prefs = helper_.profile()->GetPrefs();
     prefs->SetBoolean(prefs::kDeleteBrowsingHistory, true);
     prefs->SetBoolean(prefs::kDeleteDownloadHistory, false);
     prefs->SetBoolean(prefs::kDeleteCache, true);
     prefs->SetBoolean(prefs::kDeleteCookies, false);
     prefs->SetBoolean(prefs::kDeletePasswords, true);
     prefs->SetBoolean(prefs::kDeleteFormData, false);
     prefs->SetInteger(prefs::kDeleteTimePeriod,
                       BrowsingDataRemover::FOUR_WEEKS);
 
-    controller_.reset(
-      [[ClearBrowsingDataController alloc] initWithProfile:helper_.profile()]);
+    controller_ =
+        [[ClearBrowsingDataController alloc] initWithProfile:helper_.profile()];
   }
 
-  CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
+  virtual void TearDown() {
+    [controller_ close];
+    CocoaTest::TearDown();
+  }
+
   BrowserTestHelper helper_;
-  scoped_nsobject<ClearBrowsingDataController> controller_;
+  ClearBrowsingDataController* controller_;
 };
 
 TEST_F(ClearBrowsingDataControllerTest, InitialState) {
   // Check properties match the prefs set above:
   EXPECT_TRUE([controller_ clearBrowsingHistory]);
   EXPECT_FALSE([controller_ clearDownloadHistory]);
   EXPECT_TRUE([controller_ emptyCache]);
   EXPECT_FALSE([controller_ deleteCookies]);
   EXPECT_TRUE([controller_ clearSavedPasswords]);
   EXPECT_FALSE([controller_ clearFormData]);
@@ skipping 51 matching lines @@
   // Make sure the rest of the prefs didn't change:
   EXPECT_TRUE(prefs->GetBoolean(prefs::kDeleteCache));
   EXPECT_FALSE(prefs->GetBoolean(prefs::kDeleteCookies));
   EXPECT_TRUE(prefs->GetBoolean(prefs::kDeletePasswords));
   EXPECT_FALSE(prefs->GetBoolean(prefs::kDeleteFormData));
   EXPECT_EQ(BrowsingDataRemover::FOUR_WEEKS,
             prefs->GetInteger(prefs::kDeleteTimePeriod));
 }
 
 }  // namespace