chromeos: Enable Alt-Shift-S to show system tray bubble for mash

ash/common/system/tray/system_tray_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 "ash/common/system/tray/system_tray.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/accelerators/accelerator_controller.h"
@@ skipping 187 matching lines @@
 
   // Ensure that closing the bubble destroys it.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
   ASSERT_FALSE(tray->CloseSystemBubble());
 }
 
 // Make sure the opening system tray bubble will not deactivate the
 // other window. crbug.com/120680.
 TEST_F(SystemTrayTest, Activation) {
-  // TODO: investigate why this fails in mash. http://crbug.com/695559.
-  if (WmShell::Get()->IsRunningInMash())
-    return;
-
   SystemTray* tray = GetPrimarySystemTray();
   std::unique_ptr<views::Widget> widget(CreateTestWidget(
       nullptr, kShellWindowId_DefaultContainer, gfx::Rect(0, 0, 100, 100)));
   EXPECT_TRUE(widget->IsActive());
 
+  // The window stays active after the bubble opens.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   ASSERT_TRUE(tray->GetWidget());
   EXPECT_FALSE(tray->GetSystemBubble()->bubble_view()->GetWidget()->IsActive());
   EXPECT_TRUE(widget->IsActive());
 
+  // Activating the bubble makes the window lose activation.
   tray->ActivateBubble();
   EXPECT_TRUE(tray->GetSystemBubble()->bubble_view()->GetWidget()->IsActive());
   EXPECT_FALSE(widget->IsActive());
 
-  // Accelerator will activate the bubble.
+  // Closing the bubble re-activates the window.

[msw, 2017/03/14 17:25:23]

aside: Activation changes in unit tests can be flaky, right? (multiple unit
tests run concurrently, but perhaps they're in different ash shell environments,
and the focus/activation isn't shared across test fixtures). I guess if this
hasn't been flaky, then it's okay to leave as-is.

[James Cook, 2017/03/14 17:46:30]

Acknowledged. I think each test gets its own ash::Shell environment.

   tray->CloseSystemBubble();
+  EXPECT_TRUE(widget->IsActive());
 
-  EXPECT_TRUE(widget->IsActive());
+  // Opening the bubble with an accelerator activates the bubble because the
+  // user will probably navigate with the keyboard.
   WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
       SHOW_SYSTEM_TRAY_BUBBLE);
+  ASSERT_TRUE(tray->GetWidget());
   EXPECT_TRUE(tray->GetSystemBubble()->bubble_view()->GetWidget()->IsActive());
   EXPECT_FALSE(widget->IsActive());
 }
 
 // Opening and closing the bubble should change the coloring of the tray.
 TEST_F(SystemTrayTest, SystemTrayColoring) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
   // At the beginning the tray coloring is not active.
   ASSERT_FALSE(tray->is_active());
@@ skipping 313 matching lines @@
 
   EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
 }
 
 TEST_F(SystemTrayTest, SeparatorThickness) {
   EXPECT_EQ(kSeparatorWidth, views::Separator::kThickness);
 }
 
 }  // namespace test
 }  // namespace ash