| Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| index 1c48da471eba7fc740cb2c4240bb94fa01a32a0f..45603b6bac3e025b67b611e2e02935b9de7cb084 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| @@ -1123,7 +1123,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| "unloadFileDialog")));
|
|
|
| // Slow tests are disabled on debug build. http://crbug.com/327719
|
| -#if !defined(NDEBUG)
|
| +// Disabled under MSAN as well. http://crbug.com/468980.
|
| +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| #define MAYBE_CopyBetweenWindows DISABLED_CopyBetweenWindows
|
| #else
|
| #define MAYBE_CopyBetweenWindows CopyBetweenWindows
|
| @@ -1238,7 +1239,8 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
|
|
|
| // 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_BasicDownloads DISABLED_PRE_BasicDownloads
|
| #define MAYBE_BasicDownloads DISABLED_BasicDownloads
|
| #else
|
|
|