Disable SmartSessionRestoreTest.PRE_CorrectLoadingOrder consistently (flaky)

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 1502 matching lines @@
     std::vector<content::DownloadItem*> downloads;
     download_manager->GetAllDownloads(&downloads);
     ASSERT_EQ(2u, downloads.size());
     std::set<GURL> download_urls{downloads[0]->GetURL(),
                                  downloads[1]->GetURL()};
     std::set<GURL> expected_urls{first_download_url, second_download_url};
     EXPECT_EQ(expected_urls, download_urls);
   }
 }
 
-IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, PRE_CorrectLoadingOrder) {
+// PRE_CorrectLoadingOrder is flaky on ChromeOS MSAN and Mac.
+// See http://crbug.com/493167.
+#if (defined(OS_CHROMEOS) && defined(MEMORY_SANITIZER)) || defined(OS_MACOSX)
+#define MAYBE_PRE_CorrectLoadingOrder DISABLED_PRE_CorrectLoadingOrder
+#define MAYBE_CorrectLoadingOrder DISABLED_CorrectLoadingOrder
+#else
+#define MAYBE_PRE_CorrectLoadingOrder PRE_CorrectLoadingOrder
+#define MAYBE_CorrectLoadingOrder CorrectLoadingOrder
+#endif
+IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, MAYBE_PRE_CorrectLoadingOrder) {
   Profile* profile = browser()->profile();
 
   const int activation_order[] = {4, 2, 1, 5, 0, 3};
 
   // Replace the first tab and add the other tabs.
   ui_test_utils::NavigateToURL(browser(), GURL(kUrls[0]));
   for (size_t i = 1; i < kExpectedNumTabs; i++) {
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), GURL(kUrls[i]), WindowOpenDisposition::NEW_FOREGROUND_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
@@ skipping 32 matching lines @@
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 
   // Activate the 2nd tab before the browser closes. This should be persisted in
   // the following test.
   new_browser->tab_strip_model()->ActivateTabAt(1, true);
 }
 
-// PRE_CorrectLoadingOrder is flaky on ChromeOS MSAN: https://crbug.com/582323
-// And Mac: https://crbug.com/656687
-#if (defined(OS_CHROMEOS) && defined(MEMORY_SANITIZER)) || defined(OS_MACOSX)
-#define MAYBE_CorrectLoadingOrder DISABLED_CorrectLoadingOrder
-#else
-#define MAYBE_CorrectLoadingOrder CorrectLoadingOrder
-#endif
 IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, MAYBE_CorrectLoadingOrder) {
   const int activation_order[] = {4, 2, 5, 0, 3, 1};
   Profile* profile = browser()->profile();
 
   // Close the browser that gets opened automatically so we can track the order
   // of loading of the tabs.
   std::unique_ptr<ScopedKeepAlive> keep_alive(new ScopedKeepAlive(
       KeepAliveOrigin::SESSION_RESTORE, KeepAliveRestartOption::DISABLED));
   CloseBrowserSynchronously(browser());
   // We have an extra tab that is added when the test starts, which gets ignored
@@ skipping 18 matching lines @@
   // automatically at the start of the test.
   for (size_t i = 1; i < web_contents().size(); i++) {
     GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]);
     ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
     if (i > 0) {
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 }