Disabling flaky OpenSingleVideoOnDrive on ChromeOS

chrome/browser/chromeos/file_manager/video_player_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h"
 
 #include "chromeos/chromeos_switches.h"
 
 namespace file_manager {
 
@@ skipping 36 matching lines @@
 #define MAYBE_OpenSingleVideoOnDownloads DISABLED_OpenSingleVideoOnDownloads
 #else
 #define MAYBE_OpenSingleVideoOnDownloads OpenSingleVideoOnDownloads
 #endif
 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTestInGuestMode,
                        MAYBE_OpenSingleVideoOnDownloads) {
   set_test_case_name("openSingleVideoOnDownloads");
   StartTest();
 }
 
-// http://crbug.com/508949
-#if defined(MEMORY_SANITIZER)
+// MEMORY_SANITIZER: http://crbug.com/508949
+// CHROME_OS: http://crbug 688568

[tapted, 2017/02/06 23:59:23]

nit: missing slash here? (crbug 688568 -> crbug/688568

(I would also add 508949 to BUG= -- it's still possible these are related)

[joedow, 2017/02/07 00:11:57]

Good catch, I pushed this too quickly.  Will fix and resubmit.

+#if defined(MEMORY_SANITIZER) || defined(OS_CHROMEOS)
 #define MAYBE_OpenSingleVideoOnDrive DISABLED_OpenSingleVideoOnDrive
 #else
 #define MAYBE_OpenSingleVideoOnDrive OpenSingleVideoOnDrive
 #endif
 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, MAYBE_OpenSingleVideoOnDrive) {
   set_test_case_name("openSingleVideoOnDrive");
   StartTest();
 }
 
 // http://crbug.com/508949
@@ skipping 12 matching lines @@
 #define MAYBE_ClickControlButtons DISABLED_ClickControlButtons
 #else
 #define MAYBE_ClickControlButtons ClickControlButtons
 #endif
 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, MAYBE_ClickControlButtons) {
   set_test_case_name("clickControlButtons");
   StartTest();
 }
 
 }  // namespace file_manager