chromeos: makes more tests run in both mash and ash

ash/metrics/desktop_task_switch_metric_recorder_unittest.cc

Index: ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
diff --git a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
index 91e4c18f6e4b570e70ccc4abb98176005522fd07..2dcf49f562a475bd53a2e6346db9498ef8b18703 100644
--- a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
+++ b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -119,6 +120,10 @@ DesktopTaskSwitchMetricRecorderTest::CreateNonPositionableWindow() const {
 // 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();
@@ -135,6 +140,10 @@ TEST_F(DesktopTaskSwitchMetricRecorderTest,
 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 =
@@ -166,6 +175,10 @@ TEST_F(
 // 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 =
@@ -307,6 +320,9 @@ aura::Window* DesktopTaskSwitchMetricRecorderWithShellIntegrationTest::
 // 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));