Disable remaining tests unrelated to UnifiedSystemTray.

This CL disables unit tests that are testing the features that are just
removed in UnifiedSystemTray. These tests crashed/failed when
UnifiedSystemTray was enabled.

TEST=ash_unittests --enable-features=SystemTrayUnified
BUG=847104

Change-Id: I7a8b9b0723737fc03a048d41be2f23b1e73dd8a7
Reviewed-on: https://chromium-review.googlesource.com/1086813Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564716}

ash/system/media_security/multi_profile_media_tray_item_unittest.cc

@@ -6,6 +6,7 @@
 
 #include "ash/ash_view_ids.h"
 #include "ash/media_controller.h"
+#include "ash/public/cpp/ash_features.h"
 #include "ash/public/interfaces/media.mojom.h"
 #include "ash/session/session_controller.h"
 #include "ash/session/test_session_controller_client.h"
@@ -38,6 +39,11 @@ class MultiProfileMediaTrayItemTest : public AshTestBase {
 };
 
 TEST_F(MultiProfileMediaTrayItemTest, NotifyMediaCaptureChange) {
+  // TODO(tetsui): Remove the test after UnifiedSystemTray launch.
+  // https://crbug.com/847104
+  if (features::IsSystemTrayUnifiedEnabled())
+    return;
+
   GetSessionControllerClient()->CreatePredefinedUserSessions(2);
 
   SystemTray* system_tray = GetPrimarySystemTray();

ash/system/tray/tray_detailed_view_unittest.cc

@@ -5,6 +5,7 @@
 #include "ash/system/tray/tray_detailed_view.h"
 
 #include "ash/ash_view_ids.h"
+#include "ash/public/cpp/ash_features.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_bubble.h"
@@ -127,6 +128,11 @@ class TrayDetailedViewTest : public AshTestBase {
 };
 
 TEST_F(TrayDetailedViewTest, TransitionToDefaultViewTest) {
+  // TODO(tetsui): Remove the test after UnifiedSystemTray launch.
+  // https://crbug.com/847104
+  if (features::IsSystemTrayUnifiedEnabled())
+    return;
+
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
@@ -177,6 +183,11 @@ TEST_F(TrayDetailedViewTest, TransitionToDefaultViewTest) {
 }
 
 TEST_F(TrayDetailedViewTest, ScrollContentsTest) {
+  // TODO(tetsui): Remove the test after UnifiedSystemTray launch.
+  // https://crbug.com/847104
+  if (features::IsSystemTrayUnifiedEnabled())
+    return;
+
   SystemTray* tray = GetPrimarySystemTray();
   TestItem* test_item = new TestItem;
   tray->AddTrayItem(base::WrapUnique(test_item));