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/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/prefs/pref_service_syncable.h" | 12 #include "chrome/browser/prefs/pref_service_syncable.h" |
13 #include "chrome/browser/search_engines/template_url_service_factory.h" | 13 #include "chrome/browser/search_engines/template_url_service_factory.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_commands.h" | 15 #include "chrome/browser/ui/browser_commands.h" |
16 #include "chrome/browser/ui/browser_tabstrip.h" | 16 #include "chrome/browser/ui/browser_tabstrip.h" |
17 #include "chrome/browser/ui/host_desktop.h" | 17 #include "chrome/browser/ui/host_desktop.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
19 #include "chrome/test/base/testing_browser_process.h" | 19 #include "chrome/test/base/testing_browser_process.h" |
20 #include "chrome/test/base/testing_profile.h" | 20 #include "chrome/test/base/testing_profile.h" |
21 #include "components/bookmarks/test/bookmark_test_helpers.h" | 21 #include "components/bookmarks/test/bookmark_test_helpers.h" |
22 #include "content/public/test/test_browser_thread_bundle.h" | 22 #include "content/public/test/test_browser_thread_bundle.h" |
| 23 #include "ui/gfx/host_desktop_type.h" |
23 | 24 |
24 CocoaProfileTest::CocoaProfileTest() | 25 CocoaProfileTest::CocoaProfileTest() |
25 : profile_manager_(TestingBrowserProcess::GetGlobal()), | 26 : profile_manager_(TestingBrowserProcess::GetGlobal()), |
26 profile_(NULL), | 27 profile_(NULL), |
27 thread_bundle_(new content::TestBrowserThreadBundle) { | 28 thread_bundle_(new content::TestBrowserThreadBundle) { |
28 } | 29 } |
29 | 30 |
30 CocoaProfileTest::~CocoaProfileTest() { | 31 CocoaProfileTest::~CocoaProfileTest() { |
31 // Delete the testing profile on the UI thread. But first release the | 32 // Delete the testing profile on the UI thread. But first release the |
32 // browser, since it may trigger accesses to the profile upon destruction. | 33 // browser, since it may trigger accesses to the profile upon destruction. |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 browser_->tab_strip_model()->CloseAllTabs(); | 94 browser_->tab_strip_model()->CloseAllTabs(); |
94 chrome::CloseWindow(browser_.get()); | 95 chrome::CloseWindow(browser_.get()); |
95 // |browser_| will be deleted by its BrowserWindowController. | 96 // |browser_| will be deleted by its BrowserWindowController. |
96 ignore_result(browser_.release()); | 97 ignore_result(browser_.release()); |
97 } | 98 } |
98 | 99 |
99 Browser* CocoaProfileTest::CreateBrowser() { | 100 Browser* CocoaProfileTest::CreateBrowser() { |
100 return new Browser(Browser::CreateParams(profile(), | 101 return new Browser(Browser::CreateParams(profile(), |
101 chrome::GetActiveDesktop())); | 102 chrome::GetActiveDesktop())); |
102 } | 103 } |
OLD | NEW |