| 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 0e9d776454dba7b75b9ef9d8c3e684f482494b38..1edb332ea438397bd213e05099a1a73bd0c06cb9 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| @@ -677,19 +677,20 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,
|
| StartTest();
|
| }
|
|
|
| +// Flaky: crbug.com/715961.
|
| +// Previously it was disabled via DISABLE_SLOW_FILESAPP_TESTS and in
|
| +// OFFICIAL_BUILD, see http://crbug.com/429294.
|
| +IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,
|
| + DISABLED_PRE_BasicDrive) {
|
| + AddAllUsers();
|
| +}
|
| +
|
| // Fails on official build. http://crbug.com/429294
|
| #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| -#define MAYBE_PRE_BasicDrive DISABLED_PRE_BasicDrive
|
| #define MAYBE_BasicDrive DISABLED_BasicDrive
|
| #else
|
| -#define MAYBE_PRE_BasicDrive PRE_BasicDrive
|
| #define MAYBE_BasicDrive BasicDrive
|
| #endif
|
| -IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,
|
| - MAYBE_PRE_BasicDrive) {
|
| - AddAllUsers();
|
| -}
|
| -
|
| IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) {
|
| AddAllUsers();
|
|
|
|
|