Re-enable RestorePrefs/FileManagerBrowserTest on all bots

Mash browser tests do not support this test (see patch set #2 trys) so
disable it in mash.

No-Tree-Checks: true
Bug: 836254,701924
Change-Id: I3266d131b84c261e5bb6b9358b7c9132172bbabf
Reviewed-on: https://chromium-review.googlesource.com/1029470Reviewed-by: Stuart Langley <slangley@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553877}

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

@@ -278,15 +278,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
         TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDownloads"),
         TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDrive")));
 
-// Fails on official build. http://crbug.com/429294
-// Disabled due to flakiness. https://crbug.com/701924
-#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
-#define MAYBE_RestorePrefs DISABLED_RestorePrefs
-#else
-#define MAYBE_RestorePrefs RestorePrefs
-#endif
 WRAPPED_INSTANTIATE_TEST_CASE_P(
-    DISABLED_RestorePrefs,
+    RestorePrefs,
     FileManagerBrowserTest,
     ::testing::Values(TestParameter(IN_GUEST_MODE, "restoreSortColumn"),
                       TestParameter(NOT_IN_GUEST_MODE, "restoreSortColumn"),

testing/buildbot/filters/mash.browser_tests.filter

@@ -327,6 +327,7 @@
 -KeyboardOperations/FileManagerBrowserTest.*
 -Transfer/FileManagerBrowserTest.*
 -GenericTask/FileManagerBrowserTest.*
+-RestorePrefs/FileManagerBrowserTest.*
 -ShowGridView/FileManagerBrowserTest.*
 -Providers/FileManagerBrowserTest.*
 -OpenFileDialog/FileManagerBrowserTest.*