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 "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" |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 ViewEventTestBase::SetUp(); | 222 ViewEventTestBase::SetUp(); |
223 } | 223 } |
224 | 224 |
225 virtual void TearDown() { | 225 virtual void TearDown() { |
226 // Destroy everything, then run the message loop to ensure we delete all | 226 // Destroy everything, then run the message loop to ensure we delete all |
227 // Tasks and fully shut down. | 227 // Tasks and fully shut down. |
228 browser_->CloseAllTabs(); | 228 browser_->CloseAllTabs(); |
229 bb_view_.reset(); | 229 bb_view_.reset(); |
230 browser_.reset(); | 230 browser_.reset(); |
231 profile_.reset(); | 231 profile_.reset(); |
232 MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); | 232 MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
233 MessageLoop::current()->Run(); | 233 MessageLoop::current()->Run(); |
234 | 234 |
235 ViewEventTestBase::TearDown(); | 235 ViewEventTestBase::TearDown(); |
236 BookmarkBarView::testing_ = false; | 236 BookmarkBarView::testing_ = false; |
237 views::ViewsDelegate::views_delegate = NULL; | 237 views::ViewsDelegate::views_delegate = NULL; |
238 } | 238 } |
239 | 239 |
240 protected: | 240 protected: |
241 void InstallViewsDelegate() { | 241 void InstallViewsDelegate() { |
242 views::ViewsDelegate::views_delegate = &views_delegate_; | 242 views::ViewsDelegate::views_delegate = &views_delegate_; |
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1578 ASSERT_TRUE(menu != NULL); | 1578 ASSERT_TRUE(menu != NULL); |
1579 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 1579 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |
1580 | 1580 |
1581 menu->GetMenuController()->CancelAll(); | 1581 menu->GetMenuController()->CancelAll(); |
1582 | 1582 |
1583 Done(); | 1583 Done(); |
1584 } | 1584 } |
1585 }; | 1585 }; |
1586 | 1586 |
1587 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) | 1587 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) |
OLD | NEW |