| Index: ash/common/system/tray/system_tray_unittest.cc
|
| diff --git a/ash/common/system/tray/system_tray_unittest.cc b/ash/common/system/tray/system_tray_unittest.cc
|
| index 4e770956b1eb24781e38bcdd741039a54f5c2531..6a9c270fc2058a587173a9288d6ebcbb172f8e0a 100644
|
| --- a/ash/common/system/tray/system_tray_unittest.cc
|
| +++ b/ash/common/system/tray/system_tray_unittest.cc
|
| @@ -121,9 +121,15 @@ TEST_F(SystemTrayTest, NotRecordedtemsAreNotRecorded) {
|
| RunAllPendingInMessageLoop();
|
| }
|
|
|
| +// TODO(bruthig): Re-enable. See https://crbug.com/665960.
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_NullDefaultViewIsNotRecorded DISABLED_NullDefaultViewIsNotRecorded
|
| +#else
|
| +#define MAYBE_NullDefaultViewIsNotRecorded NullDefaultViewIsNotRecorded
|
| +#endif
|
| // Verifies null default views are not recorded in the
|
| // "Ash.SystemMenu.DefaultView.VisibleItems" histogram.
|
| -TEST_F(SystemTrayTest, NullDefaultViewIsNotRecorded) {
|
| +TEST_F(SystemTrayTest, MAYBE_NullDefaultViewIsNotRecorded) {
|
| SystemTray* tray = GetPrimarySystemTray();
|
| ASSERT_TRUE(tray->GetWidget());
|
|
|
|
|