[MemSheriff] Disable a flaky CrOS test under MSan.

BUG=468982 TBR=mtomasz@chromium.org Review URL: https://codereview.chromium.org/1019393004 Cr-Commit-Position: refs/heads/master@{#322156}

[MemSheriff] Disable a flaky CrOS test under MSan.
BUG=468982 TBR=mtomasz@chromium.org Review URL: https://codereview.chromium.org/1019393004 Cr-Commit-Position: refs/heads/master@{#322156}
28307d55 · earthdok · Commit bot · ff38f027 · 28307d55
Commit 28307d55 authored Mar 25, 2015 by earthdok Committed by Commit bot Mar 25, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc ...browser/chromeos/file_manager/file_manager_browsertest.cc +2 -1

No files found.
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -1274,7 +1274,8 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,

 // Slow tests are disabled on debug build. http://crbug.com/327719
 // Fails on official build. http://crbug.com/429294
-#if !defined(NDEBUG) || defined(OFFICIAL_BUILD)
+// Disabled under MSAN as well. http://crbug.com/468982.
+#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
 #define MAYBE_PRE_BasicDrive DISABLED_PRE_BasicDrive
 #define MAYBE_BasicDrive DISABLED_BasicDrive
 #else