chromeos: makes more tests run in both mash and ash

ash/metrics/user_metrics_recorder_unittest.cc

Index: ash/metrics/user_metrics_recorder_unittest.cc
diff --git a/ash/metrics/user_metrics_recorder_unittest.cc b/ash/metrics/user_metrics_recorder_unittest.cc
index c805d75174a3062f45030e147d6712494e612f19..8351032443e29d9645c951d63da42fbe48971372 100644
--- a/ash/metrics/user_metrics_recorder_unittest.cc
+++ b/ash/metrics/user_metrics_recorder_unittest.cc
@@ -187,6 +187,10 @@ TEST_F(UserMetricsRecorderTest, VerifyStatsRecordedByRecordPeriodicMetrics) {
 // Verify the shelf item counts recorded by the
 // UserMetricsRecorder::RecordPeriodicMetrics() method.
 TEST_F(UserMetricsRecorderTest, ValuesRecordedByRecordShelfItemCounts) {
+  // TODO: investigate failure in mash, http://crbug.com/695629.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   test::TestShelfDelegate* test_shelf_delegate =
       test::TestShelfDelegate::instance();
   SetUserInActiveDesktopEnvironment(true);