chromeos: moves a bunch of tests to common_unittests

ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc

Index: ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc
diff --git a/ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc b/ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc
index 79bcc83b33d2030272cd6d05a5e98b87b9b353ed..2461306f9cb9c5537b3fa64e5e8d0f4208dbdab7 100644
--- a/ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc
+++ b/ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
@@ -153,6 +154,10 @@ void ShelfButtonPressedMetricTrackerTest::ButtonPressed(
 // a button is pressed by a mouse event.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByMouse) {
+  // TODO: investigate failure in mash. http://crbug.com/695565.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   const ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(),
                                    gfx::Point(), base::TimeTicks(), 0, 0);
 
@@ -166,6 +171,10 @@ TEST_F(ShelfButtonPressedMetricTrackerTest,
 // a button is pressed by a touch event.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByTouch) {
+  // TODO: investigate failure in mash. http://crbug.com/695565.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   const ui::TouchEvent touch_event(ui::ET_GESTURE_TAP, gfx::Point(), 0,
                                    base::TimeTicks());
 
@@ -179,6 +188,10 @@ TEST_F(ShelfButtonPressedMetricTrackerTest,
 // pressing a button causes a new window to be created.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_LaunchTaskIsRecordedWhenNewWindowIsCreated) {
+  // TODO: investigate failure in mash. http://crbug.com/695565.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   base::UserActionTester user_action_tester;
   ButtonPressed(SHELF_ACTION_NEW_WINDOW_CREATED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_LaunchTask"));
@@ -188,6 +201,10 @@ TEST_F(ShelfButtonPressedMetricTrackerTest,
 // pressing a button causes an existing window to be minimized.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_MinimizeTaskIsRecordedWhenWindowIsMinimized) {
+  // TODO: investigate failure in mash. http://crbug.com/695565.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   base::UserActionTester user_action_tester;
   ButtonPressed(SHELF_ACTION_WINDOW_MINIMIZED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_MinimizeTask"));
@@ -197,6 +214,10 @@ TEST_F(ShelfButtonPressedMetricTrackerTest,
 // pressing a button causes an existing window to be activated.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_SwitchTaskIsRecordedWhenExistingWindowIsActivated) {
+  // TODO: investigate failure in mash. http://crbug.com/695565.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   base::UserActionTester user_action_tester;
   ButtonPressed(SHELF_ACTION_WINDOW_ACTIVATED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_SwitchTask"));