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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/callback.h" | 6 #include "base/callback.h" |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
11 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
12 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
13 #include "chrome/browser/prefs/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/browser_tabstrip.h" |
16 #include "chrome/browser/ui/browser_window.h" | 17 #include "chrome/browser/ui/browser_window.h" |
17 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 18 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
18 #include "chrome/common/chrome_notification_types.h" | 19 #include "chrome/common/chrome_notification_types.h" |
19 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
20 #include "chrome/test/base/testing_browser_process.h" | 21 #include "chrome/test/base/testing_browser_process.h" |
21 #include "chrome/test/base/testing_profile.h" | 22 #include "chrome/test/base/testing_profile.h" |
22 #include "chrome/test/base/ui_test_utils.h" | 23 #include "chrome/test/base/ui_test_utils.h" |
23 #include "chrome/test/base/view_event_test_base.h" | 24 #include "chrome/test/base/view_event_test_base.h" |
24 #include "content/public/browser/notification_service.h" | 25 #include "content/public/browser/notification_service.h" |
25 #include "content/public/browser/page_navigator.h" | 26 #include "content/public/browser/page_navigator.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 } | 210 } |
210 | 211 |
211 tmp_parent.RemoveChildView(bb_view_.get()); | 212 tmp_parent.RemoveChildView(bb_view_.get()); |
212 | 213 |
213 ViewEventTestBase::SetUp(); | 214 ViewEventTestBase::SetUp(); |
214 } | 215 } |
215 | 216 |
216 virtual void TearDown() { | 217 virtual void TearDown() { |
217 // Destroy everything, then run the message loop to ensure we delete all | 218 // Destroy everything, then run the message loop to ensure we delete all |
218 // Tasks and fully shut down. | 219 // Tasks and fully shut down. |
219 browser_->CloseAllTabs(); | 220 chrome::CloseAllTabs(browser_.get()); |
220 bb_view_.reset(); | 221 bb_view_.reset(); |
221 browser_.reset(); | 222 browser_.reset(); |
222 profile_.reset(); | 223 profile_.reset(); |
223 | 224 |
224 // Run the message loop to ensure we delete allTasks and fully shut down. | 225 // Run the message loop to ensure we delete allTasks and fully shut down. |
225 MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); | 226 MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
226 MessageLoop::current()->Run(); | 227 MessageLoop::current()->Run(); |
227 | 228 |
228 ViewEventTestBase::TearDown(); | 229 ViewEventTestBase::TearDown(); |
229 bookmark_utils::DisableBookmarkBarViewAnimationsForTesting(false); | 230 bookmark_utils::DisableBookmarkBarViewAnimationsForTesting(false); |
(...skipping 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1707 Done(); | 1708 Done(); |
1708 } | 1709 } |
1709 }; | 1710 }; |
1710 | 1711 |
1711 #if defined(OS_WIN) | 1712 #if defined(OS_WIN) |
1712 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu | 1713 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu |
1713 #else | 1714 #else |
1714 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu | 1715 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu |
1715 #endif | 1716 #endif |
1716 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu) | 1717 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu) |
OLD | NEW |