Sheriff: Disable flake SessionRestoreTest tests

Tests:
essionRestoreTest.AutoClosedSingleTabDoesNotGetRestored
SessionRestoreTest.RestoreAllBrowsers

TBR: ellyjones
Bug: 1158715
Change-Id: Ic2b0ae5e19162351693d01daa47ac318c50061d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2591996Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836995}

chrome/browser/sessions/session_restore_browsertest.cc

@@ -1391,16 +1391,11 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, CloseSingleTabRestoresNothing) {
 // Verifies that launching with no previous session to a url which closes itself
 // results in no session being restored on the next launch.
 // Regression test for http://crbug.com/1052096
-#if defined(OS_MAC) && defined(ARCH_CPU_ARM64)
-// Bulk-disabled for arm64 bot stabilization: https://crbug.com/1154345
-#define MAYBE_AutoClosedSingleTabDoesNotGetRestored \
-  DISABLED_AutoClosedSingleTabDoesNotGetRestored
-#else
-#define MAYBE_AutoClosedSingleTabDoesNotGetRestored \
-  AutoClosedSingleTabDoesNotGetRestored
-#endif
+// Flaky:
+//  - Bulk-disabled for arm64 bot stabilization: https://crbug.com/1154345
+//  - Disabled for all platforms: https://crbug.com/1158715
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
-                       MAYBE_AutoClosedSingleTabDoesNotGetRestored) {
+                       DISABLED_AutoClosedSingleTabDoesNotGetRestored) {
   Profile* profile = browser()->profile();
   std::unique_ptr<ScopedKeepAlive> keep_alive(new ScopedKeepAlive(
       KeepAliveOrigin::SESSION_RESTORE, KeepAliveRestartOption::DISABLED));
@@ -1953,13 +1948,10 @@ class MultiBrowserObserver : public BrowserListObserver {
 
 // Test that when closing a profile with multiple browsers, all browsers are
 // restored when the profile is reopened.
-#if defined(OS_MAC) && defined(ARCH_CPU_ARM64)
-// Bulk-disabled for arm64 bot stabilization: https://crbug.com/1154345
-#define MAYBE_RestoreAllBrowsers DISABLED_RestoreAllBrowsers
-#else
-#define MAYBE_RestoreAllBrowsers RestoreAllBrowsers
-#endif
-IN_PROC_BROWSER_TEST_F(SessionRestoreTest, MAYBE_RestoreAllBrowsers) {
+// Flaky:
+//  - Bulk-disabled for arm64 bot stabilization: https://crbug.com/1154345
+//  - Disabled for all platforms: https://crbug.com/1158715
+IN_PROC_BROWSER_TEST_F(SessionRestoreTest, DISABLED_RestoreAllBrowsers) {
   // Create two profiles with two browsers each.
   Browser* first_profile_browser_one = browser();
   chrome::NewWindow(first_profile_browser_one);