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/public/test/test_browser_thread.h" |
10 | 10 |
11 using content::BrowserThread; | 11 using content::BrowserThread; |
12 | 12 |
13 CocoaProfileTest::CocoaProfileTest() | 13 CocoaProfileTest::CocoaProfileTest() |
14 : ui_thread_(BrowserThread::UI, &message_loop_), | 14 : ui_thread_(BrowserThread::UI, &message_loop_), |
15 profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)), | 15 profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)), |
16 profile_(NULL), | 16 profile_(NULL), |
17 file_user_blocking_thread_(new content::TestBrowserThread( | 17 file_user_blocking_thread_(new content::TestBrowserThread( |
18 BrowserThread::FILE_USER_BLOCKING, &message_loop_)), | 18 BrowserThread::FILE_USER_BLOCKING, &message_loop_)), |
19 file_thread_(new content::TestBrowserThread(BrowserThread::FILE, | 19 file_thread_(new content::TestBrowserThread(BrowserThread::FILE, |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 } | 82 } |
83 | 83 |
84 void CocoaProfileTest::CloseBrowserWindow() { | 84 void CocoaProfileTest::CloseBrowserWindow() { |
85 // Check to make sure a window was actually created. | 85 // Check to make sure a window was actually created. |
86 DCHECK(browser_->window()); | 86 DCHECK(browser_->window()); |
87 browser_->CloseAllTabs(); | 87 browser_->CloseAllTabs(); |
88 browser_->CloseWindow(); | 88 browser_->CloseWindow(); |
89 // |browser_| will be deleted by its BrowserWindowController. | 89 // |browser_| will be deleted by its BrowserWindowController. |
90 ignore_result(browser_.release()); | 90 ignore_result(browser_.release()); |
91 } | 91 } |
OLD | NEW |