views/mus: Run some more tests from views_unittests in mus.

ui/views/accessible_pane_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/accessible_pane_view.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 93 matching lines @@
   View* test_view_main = new View();
   std::unique_ptr<Widget> widget_main(new Widget());
   Widget::InitParams params_main = CreateParams(Widget::InitParams::TYPE_POPUP);
   params_main.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   // By default, TYPE_POPUP is not activatable.
   params_main.activatable = Widget::InitParams::ACTIVATABLE_YES;
   params_main.bounds = gfx::Rect(0, 0, 20, 20);
   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());
   EXPECT_TRUE(test_view_main->HasFocus());
 
   TestBarView* test_view_bar = new TestBarView();
   std::unique_ptr<Widget> widget_bar(new Widget());
   Widget::InitParams params_bar = CreateParams(Widget::InitParams::TYPE_POPUP);
   params_bar.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params_bar.activatable = Widget::InitParams::ACTIVATABLE_YES;
   params_bar.bounds = gfx::Rect(50, 50, 650, 650);
   widget_bar->Init(params_bar);
   View* root_bar = widget_bar->GetRootView();
   root_bar->AddChildView(test_view_bar);
   widget_bar->Show();
   widget_bar->Activate();
 
   // Set pane focus succeeds, focus on child.
   EXPECT_TRUE(test_view_bar->SetPaneFocusAndFocusDefault());
   EXPECT_FALSE(test_view_main->HasFocus());
   EXPECT_FALSE(widget_main->IsActive());
   EXPECT_EQ(test_view_bar, test_view_bar->GetPaneFocusTraversable());
   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();
 
   widget_main->CloseNow();
   widget_main.reset();
 }
 
 TEST_F(AccessiblePaneViewTest, TwoSetPaneFocus) {
   TestBarView* test_view = new TestBarView();
@@ skipping 65 matching lines @@
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
 
   // ESC
   test_view->AcceleratorPressed(test_view->escape_key());
   EXPECT_EQ(original_test_view->third_child_button(),
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
   widget->CloseNow();
   widget.reset();
 }
 }  // namespace views