Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(652)

Unified Diff: chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm

Issue 402066: Moved a whole pile of unittests over to CocoaTest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm
===================================================================
--- chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm (revision 32421)
+++ chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm (working copy)
@@ -17,9 +17,10 @@
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);
@@ -31,13 +32,17 @@
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) {
« no previous file with comments | « chrome/browser/cocoa/browser_window_cocoa_unittest.mm ('k') | chrome/browser/cocoa/clickhold_button_cell_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698