| 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 b74efb3c54ca81df08b6ca090ba5a6784bd1e47a..8695e7af3dde42bfeaf299f96a25d8711ac37ce5 100644
|
| --- 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
|
|
|