chromeos: makes more tests run in both mash and ash

ash/metrics/desktop_task_switch_metric_recorder_unittest.cc

 // Copyright 2015 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/metrics/desktop_task_switch_metric_recorder.h"
 
 #include <memory>
 
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/test/user_action_tester.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/wm/public/activation_client.h"
 #include "ui/wm/public/window_types.h"
 
@@ skipping 93 matching lines @@
       aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate()));
   window->SetType(ui::wm::WINDOW_TYPE_UNKNOWN);
   window->Init(ui::LAYER_NOT_DRAWN);
   return window;
 }
 
 // Verify user action is recorded when a positionable window is activated given
 // that a null window was activated last.
 TEST_F(DesktopTaskSwitchMetricRecorderTest,
        ActivatePositionableWindowWhenNullWindowWasActivatedLast) {
+  // TODO: investigate failure in mash, http://crbug.com/695628.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   std::unique_ptr<aura::Window> null_window;
   std::unique_ptr<aura::Window> positionable_window =
       CreatePositionableWindow();
 
   ActiveTaskWindowWithUserInput(null_window.get());
   ResetActionCounts();
 
   ActiveTaskWindowWithUserInput(positionable_window.get());
   EXPECT_EQ(1, GetActionCount());
 }
 
 // Verify user action is recorded whena positionable window is activated given
 // a different positionable window was activated last.
 TEST_F(
     DesktopTaskSwitchMetricRecorderTest,
     ActivatePositionableWindowWhenADifferentPositionableWindowWasActivatedLast) {
+  // TODO: investigate failure in mash, http://crbug.com/695628.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   std::unique_ptr<aura::Window> positionable_window_1 =
       CreatePositionableWindow();
   std::unique_ptr<aura::Window> positionable_window_2 =
       CreatePositionableWindow();
 
   ActiveTaskWindowWithUserInput(positionable_window_1.get());
   ResetActionCounts();
 
   ActiveTaskWindowWithUserInput(positionable_window_2.get());
   EXPECT_EQ(1, GetActionCount());
@@ skipping 11 matching lines @@
   ResetActionCounts();
 
   ActiveTaskWindowWithUserInput(positionable_window.get());
   EXPECT_EQ(0, GetActionCount());
 }
 
 // Verify user action is recorded when a positionable window is activated given
 // a non-positionable window was activated last.
 TEST_F(DesktopTaskSwitchMetricRecorderTest,
        ActivatePositionableWindowWhenANonPositionableWindowWasActivatedLast) {
+  // TODO: investigate failure in mash, http://crbug.com/695628.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   std::unique_ptr<aura::Window> non_positionable_window =
       CreateNonPositionableWindow();
   std::unique_ptr<aura::Window> positionable_window =
       CreatePositionableWindow();
 
   ActiveTaskWindowWithUserInput(non_positionable_window.get());
   ResetActionCounts();
 
   ActiveTaskWindowWithUserInput(positionable_window.get());
   EXPECT_EQ(1, GetActionCount());
@@ skipping 121 matching lines @@
 
 aura::Window* DesktopTaskSwitchMetricRecorderWithShellIntegrationTest::
     CreatePositionableWindowInShellWithBounds(const gfx::Rect& bounds) {
   return CreateTestWindowInShellWithDelegate(&test_window_delegate_, 0, bounds);
 }
 
 // Verify a user action is recorded when a positionable window is activated by
 // a INPUT_EVENT.
 TEST_F(DesktopTaskSwitchMetricRecorderWithShellIntegrationTest,
        ActivatePositionableWindowWithInputEvent) {
+  // TODO: investigate failure in mash, http://crbug.com/695628.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
   aura::Window* positionable_window =
       CreatePositionableWindowInShellWithBounds(gfx::Rect(0, 0, 10, 10));
 
   ui::test::EventGenerator event_generator(Shell::GetPrimaryRootWindow());
 
   event_generator.MoveMouseToCenterOf(positionable_window);
   event_generator.ClickLeftButton();
 
   EXPECT_EQ(1, GetActionCount());
 }
 
 // Verify a user action is not recorded when a positionable window is activated
 // by a non INPUT_EVENT.
 TEST_F(DesktopTaskSwitchMetricRecorderWithShellIntegrationTest,
        ActivatePositionableWindowWithNonInputEvent) {
   aura::Window* positionable_window =
       CreatePositionableWindowInShellWithBounds(gfx::Rect(0, 0, 10, 10));
 
   Shell::GetInstance()->activation_client()->ActivateWindow(
       positionable_window);
 
   EXPECT_EQ(0, GetActionCount());
 }
 
 }  // namespace
 }  // namespace ash