Index: ui/views/accessible_pane_view_unittest.cc |
diff --git a/ui/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc |
index d3f5bd0d44b7ada293e6327a9724ce5d3635d10e..4473d8c41c4524c0afc872a7a50ea21e8172d22a 100644 |
--- a/ui/views/accessible_pane_view_unittest.cc |
+++ b/ui/views/accessible_pane_view_unittest.cc |
@@ -111,6 +111,7 @@ TEST_F(AccessiblePaneViewTest, SetPaneFocusAndRestore) { |
widget_main->Init(params_main); |
View* root_main = widget_main->GetRootView(); |
root_main->AddChildView(test_view_main); |
+ widget_main->Show(); |
widget_main->Activate(); |
test_view_main->GetFocusManager()->SetFocusedView(test_view_main); |
EXPECT_TRUE(widget_main->IsActive()); |
@@ -136,16 +137,19 @@ TEST_F(AccessiblePaneViewTest, SetPaneFocusAndRestore) { |
EXPECT_EQ(test_view_bar->child_button(), |
test_view_bar->GetWidget()->GetFocusManager()->GetFocusedView()); |
- // Deactivate() is only reliable on Ash. On Windows it uses ::GetNextWindow() |
- // to simply activate another window, and which one is not predictable. On |
- // Mac, Deactivate() is not implemented. Note that TestBarView calls |
- // set_allow_deactivate_on_esc(true), which is only otherwise used in Ash. |
+ if (!IsMus()) { |
+ // Deactivate() is only reliable on Ash. On Windows it uses |
+ // ::GetNextWindow() to simply activate another window, and which one is not |
+ // predictable. On Mac, Deactivate() is not implemented. Note that |
+ // TestBarView calls set_allow_deactivate_on_esc(true), which is only |
+ // otherwise used in Ash. |
#if !defined(OS_MACOSX) || defined(USE_ASH) |
- // Esc should deactivate the widget. |
- test_view_bar->AcceleratorPressed(test_view_bar->escape_key()); |
- EXPECT_TRUE(widget_main->IsActive()); |
- EXPECT_FALSE(widget_bar->IsActive()); |
+ // Esc should deactivate the widget. |
+ test_view_bar->AcceleratorPressed(test_view_bar->escape_key()); |
+ EXPECT_TRUE(widget_main->IsActive()); |
+ EXPECT_FALSE(widget_bar->IsActive()); |
#endif |
+ } |
widget_bar->CloseNow(); |
widget_bar.reset(); |