| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 5 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/test/base/testing_browser_process.h" | 8 #include "chrome/test/base/testing_browser_process.h" |
| 9 #include "content/test/test_browser_thread.h" | 9 #include "content/test/test_browser_thread.h" |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 // were to delete the ProfileManager, the UI thread would at that point no | 32 // were to delete the ProfileManager, the UI thread would at that point no |
| 33 // longer exist. | 33 // longer exist. |
| 34 static_cast<TestingBrowserProcess*>(g_browser_process)->SetProfileManager( | 34 static_cast<TestingBrowserProcess*>(g_browser_process)->SetProfileManager( |
| 35 NULL); | 35 NULL); |
| 36 | 36 |
| 37 // Make sure any pending tasks run before we destroy other threads. | 37 // Make sure any pending tasks run before we destroy other threads. |
| 38 message_loop_.RunAllPending(); | 38 message_loop_.RunAllPending(); |
| 39 | 39 |
| 40 // Drop any new tasks for the IO and FILE threads. | 40 // Drop any new tasks for the IO and FILE threads. |
| 41 io_thread_.reset(); | 41 io_thread_.reset(); |
| 42 file_user_blocking_thread_.reset(); |
| 42 file_thread_.reset(); | 43 file_thread_.reset(); |
| 43 file_user_blocking_thread_.reset(); | |
| 44 | 44 |
| 45 message_loop_.RunAllPending(); | 45 message_loop_.RunAllPending(); |
| 46 } | 46 } |
| 47 | 47 |
| 48 void CocoaProfileTest::SetUp() { | 48 void CocoaProfileTest::SetUp() { |
| 49 CocoaTest::SetUp(); | 49 CocoaTest::SetUp(); |
| 50 | 50 |
| 51 ASSERT_TRUE(profile_manager_.SetUp()); | 51 ASSERT_TRUE(profile_manager_.SetUp()); |
| 52 | 52 |
| 53 profile_ = profile_manager_.CreateTestingProfile("default"); | 53 profile_ = profile_manager_.CreateTestingProfile("default"); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 81 } | 81 } |
| 82 | 82 |
| 83 void CocoaProfileTest::CloseBrowserWindow() { | 83 void CocoaProfileTest::CloseBrowserWindow() { |
| 84 // Check to make sure a window was actually created. | 84 // Check to make sure a window was actually created. |
| 85 DCHECK(browser_->window()); | 85 DCHECK(browser_->window()); |
| 86 browser_->CloseAllTabs(); | 86 browser_->CloseAllTabs(); |
| 87 browser_->CloseWindow(); | 87 browser_->CloseWindow(); |
| 88 // |browser_| will be deleted by its BrowserWindowController. | 88 // |browser_| will be deleted by its BrowserWindowController. |
| 89 ignore_result(browser_.release()); | 89 ignore_result(browser_.release()); |
| 90 } | 90 } |
| OLD | NEW |