| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/test/cocoa_profile_test.h" |
| 6 | 6 |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 9 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| 12 #include "chrome/browser/search_engines/template_url_service_factory.h" | 12 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/browser_commands.h" | 14 #include "chrome/browser/ui/browser_commands.h" |
| 15 #include "chrome/browser/ui/browser_tabstrip.h" | 15 #include "chrome/browser/ui/browser_tabstrip.h" |
| 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 17 #include "chrome/test/base/testing_browser_process.h" | 17 #include "chrome/test/base/testing_browser_process.h" |
| 18 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
| 19 #include "components/bookmarks/test/bookmark_test_helpers.h" | 19 #include "components/bookmarks/test/bookmark_test_helpers.h" |
| 20 #include "components/sync_preferences/pref_service_syncable.h" | 20 #include "components/sync_preferences/pref_service_syncable.h" |
| 21 #include "content/public/test/test_browser_thread_bundle.h" | 21 #include "content/public/test/test_browser_thread_bundle.h" |
| 22 | 22 |
| 23 CocoaProfileTest::CocoaProfileTest() | 23 CocoaProfileTest::CocoaProfileTest() |
| 24 : profile_manager_(TestingBrowserProcess::GetGlobal()), | 24 : profile_manager_(TestingBrowserProcess::GetGlobal()), |
| 25 profile_(NULL), | 25 profile_(NULL), |
| 26 thread_bundle_(new content::TestBrowserThreadBundle) { | 26 thread_bundle_(new content::TestBrowserThreadBundle) {} |
| 27 } | |
| 28 | 27 |
| 29 CocoaProfileTest::~CocoaProfileTest() { | 28 CocoaProfileTest::~CocoaProfileTest() { |
| 30 // Delete the testing profile on the UI thread. But first release the | 29 // Delete the testing profile on the UI thread. But first release the |
| 31 // browser, since it may trigger accesses to the profile upon destruction. | 30 // browser, since it may trigger accesses to the profile upon destruction. |
| 32 browser_.reset(); | 31 browser_.reset(); |
| 33 | 32 |
| 34 base::RunLoop().RunUntilIdle(); | 33 base::RunLoop().RunUntilIdle(); |
| 35 | 34 |
| 36 // Some services created on the TestingProfile require deletion on the UI | 35 // Some services created on the TestingProfile require deletion on the UI |
| 37 // thread. If the scoper in TestingBrowserProcess, owned by ChromeTestSuite, | 36 // thread. If the scoper in TestingBrowserProcess, owned by ChromeTestSuite, |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 DCHECK(browser_->window()); | 89 DCHECK(browser_->window()); |
| 91 browser_->tab_strip_model()->CloseAllTabs(); | 90 browser_->tab_strip_model()->CloseAllTabs(); |
| 92 chrome::CloseWindow(browser_.get()); | 91 chrome::CloseWindow(browser_.get()); |
| 93 // |browser_| will be deleted by its BrowserWindowController. | 92 // |browser_| will be deleted by its BrowserWindowController. |
| 94 ignore_result(browser_.release()); | 93 ignore_result(browser_.release()); |
| 95 } | 94 } |
| 96 | 95 |
| 97 Browser* CocoaProfileTest::CreateBrowser() { | 96 Browser* CocoaProfileTest::CreateBrowser() { |
| 98 return new Browser(Browser::CreateParams(profile())); | 97 return new Browser(Browser::CreateParams(profile())); |
| 99 } | 98 } |
| OLD | NEW |