Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: chrome/browser/ui/views/accessibility_event_router_views_unittest.cc

Issue 8566037: aura: Fix unit_tests on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_info_cache_unittest.cc ('k') | ui/aura/desktop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
index 102b007edf54cbba820da6a01c6c5c8ccf2ee7a5..1fc9a70eaee11f5704427302566b89dfc1d4db2a 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -90,20 +90,17 @@ class AccessibilityEventRouterViewsTest
public:
virtual void SetUp() {
views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
- window_delegate_ = NULL;
}
virtual void TearDown() {
delete views::ViewsDelegate::views_delegate;
views::ViewsDelegate::views_delegate = NULL;
- if (window_delegate_)
- delete window_delegate_;
}
views::Widget* CreateWindowWithContents(views::View* contents) {
- window_delegate_ = new AccessibilityWindowDelegate(contents);
- return views::Widget::CreateWindowWithBounds(window_delegate_,
- gfx::Rect(0, 0, 500, 500));
+ return views::Widget::CreateWindowWithBounds(
+ new AccessibilityWindowDelegate(contents),
+ gfx::Rect(0, 0, 500, 500));
}
protected:
@@ -122,7 +119,6 @@ class AccessibilityEventRouterViewsTest
MessageLoopForUI message_loop_;
int focus_event_count_;
std::string last_control_name_;
- AccessibilityWindowDelegate* window_delegate_;
};
TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
@@ -184,6 +180,8 @@ TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
focus_manager->AdvanceFocus(false);
EXPECT_EQ(3, focus_event_count_);
EXPECT_EQ(kButton1ASCII, last_control_name_);
+
+ window->CloseNow();
}
#endif // defined(TOOLKIT_VIEWS)
« no previous file with comments | « chrome/browser/profiles/profile_info_cache_unittest.cc ('k') | ui/aura/desktop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698