Fix TabManagerTest.TabManagerBasics flakiness with PlzNavigate.

chrome/browser/memory/tab_manager_browsertest.cc

 // Copyright (c) 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 "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 #include "chrome/browser/memory/tab_manager.h"
 #include "chrome/browser/memory/tab_manager_web_contents_data.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "url/gurl.h"
 
 using content::OpenURLParams;
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 
 namespace memory {
 
 class TabManagerTest : public InProcessBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(TabManagerTest, TabManagerBasics) {
   using content::WindowedNotificationObserver;
   TabManager* tab_manager = g_browser_process->GetTabManager();
   EXPECT_FALSE(tab_manager->recent_tab_discard());
 
   // Disable the protection of recent tabs.
   tab_manager->set_minimum_protection_time_for_tests(
       base::TimeDelta::FromMinutes(0));
 
   // Get three tabs open.
-  WindowedNotificationObserver load1(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
                       WindowOpenDisposition::CURRENT_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open1);
+  content::TestNavigationObserver load1(browser()->OpenURL(open1));
   load1.Wait();
 
-  WindowedNotificationObserver load2(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
                       WindowOpenDisposition::NEW_FOREGROUND_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open2);
+  content::TestNavigationObserver load2(browser()->OpenURL(open2));
   load2.Wait();
 
-  WindowedNotificationObserver load3(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open3(GURL(chrome::kChromeUITermsURL), content::Referrer(),
                       WindowOpenDisposition::NEW_FOREGROUND_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open3);
+  content::TestNavigationObserver load3(browser()->OpenURL(open3));
   load3.Wait();
 
   auto* tsm = browser()->tab_strip_model();
   EXPECT_EQ(3, tsm->count());
 
   // Navigate the current (third) tab to a different URL, so we can test
   // back/forward later.
-  WindowedNotificationObserver load4(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open4(GURL(chrome::kChromeUIVersionURL), content::Referrer(),
                       WindowOpenDisposition::CURRENT_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open4);
+  content::TestNavigationObserver load4(browser()->OpenURL(open4));
   load4.Wait();
 
   // Navigate the third tab again, such that we have three navigation entries.
-  WindowedNotificationObserver load5(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open5(GURL("chrome://dns"), content::Referrer(),
                       WindowOpenDisposition::CURRENT_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open5);
+  content::TestNavigationObserver load5(browser()->OpenURL(open5));
   load5.Wait();
 
   EXPECT_EQ(3, tsm->count());
 
   // Discard a tab.  It should kill the first tab, since it was the oldest
   // and was not selected.
   EXPECT_TRUE(tab_manager->DiscardTabImpl());
   EXPECT_EQ(3, tsm->count());
   EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
   EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
@@ skipping 18 matching lines @@
   tsm->ActivateTabAt(1, true);
   EXPECT_EQ(1, tsm->active_index());
   EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
   tab_manager->DiscardWebContentsAt(2, tsm);
   EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
 
   // Force creation of the FindBarController.
   browser()->GetFindBarController();
 
   // Select the first tab.  It should reload.
-  WindowedNotificationObserver reload1(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
+  content::TestNavigationObserver reload1(
+      browser()->tab_strip_model()->GetWebContentsAt(0));
   chrome::SelectNumberedTab(browser(), 0);
   reload1.Wait();
   // Make sure the FindBarController gets the right WebContents.
   EXPECT_EQ(browser()->GetFindBarController()->web_contents(),
             tsm->GetActiveWebContents());
   EXPECT_EQ(0, tsm->active_index());
   EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
   EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
   EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
 
   // Select the third tab. It should reload.
-  WindowedNotificationObserver reload2(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
+  content::TestNavigationObserver reload2(
+      browser()->tab_strip_model()->GetWebContentsAt(2));
   chrome::SelectNumberedTab(browser(), 2);
   reload2.Wait();
   EXPECT_EQ(2, tsm->active_index());
   EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
   EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
   EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
 
   // Navigate the third tab back twice.  We used to crash here due to
   // crbug.com/121373.
   EXPECT_TRUE(chrome::CanGoBack(browser()));
   EXPECT_FALSE(chrome::CanGoForward(browser()));
-  WindowedNotificationObserver back1(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
+  content::TestNavigationObserver back1(
+      browser()->tab_strip_model()->GetActiveWebContents());
   chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
   back1.Wait();
   EXPECT_TRUE(chrome::CanGoBack(browser()));
   EXPECT_TRUE(chrome::CanGoForward(browser()));
-  WindowedNotificationObserver back2(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
+  content::TestNavigationObserver back2(
+      browser()->tab_strip_model()->GetActiveWebContents());
   chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
   back2.Wait();
   EXPECT_FALSE(chrome::CanGoBack(browser()));
   EXPECT_TRUE(chrome::CanGoForward(browser()));
 }
 
 // On Linux, memory pressure listener is not implemented yet.
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
 
 // Test that the MemoryPressureListener event is properly triggering a tab
 // discard upon |MEMORY_PRESSURE_LEVEL_CRITICAL| event.
 IN_PROC_BROWSER_TEST_F(TabManagerTest, OomPressureListener) {
   TabManager* tab_manager = g_browser_process->GetTabManager();
 
   // Disable the protection of recent tabs.
   tab_manager->set_minimum_protection_time_for_tests(
       base::TimeDelta::FromMinutes(0));
 
   // Get three tabs open.
-  content::WindowedNotificationObserver load1(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
                       WindowOpenDisposition::CURRENT_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open1);
+  content::TestNavigationObserver load1(browser()->OpenURL(open1));
   load1.Wait();
 
-  content::WindowedNotificationObserver load2(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
                       WindowOpenDisposition::NEW_FOREGROUND_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open2);
+  content::TestNavigationObserver load2(browser()->OpenURL(open2));
   load2.Wait();
   EXPECT_FALSE(tab_manager->recent_tab_discard());
 
   // Nothing should happen with a moderate memory pressure event.
   base::MemoryPressureListener::NotifyMemoryPressure(
       base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE);
   EXPECT_FALSE(tab_manager->recent_tab_discard());
 
   // A critical memory pressure event should discard a tab.
   base::MemoryPressureListener::NotifyMemoryPressure(
@@ skipping 17 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(TabManagerTest, InvalidOrEmptyURL) {
   TabManager* tab_manager = g_browser_process->GetTabManager();
 
   // Disable the protection of recent tabs.
   tab_manager->set_minimum_protection_time_for_tests(
       base::TimeDelta::FromMinutes(0));
 
   // Open two tabs. Wait for the foreground one to load but do not wait for the
   // background one.
-  content::WindowedNotificationObserver load1(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
                       WindowOpenDisposition::CURRENT_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open1);
+  content::TestNavigationObserver load1(browser()->OpenURL(open1));
   load1.Wait();
 
-  content::WindowedNotificationObserver load2(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
                       WindowOpenDisposition::NEW_BACKGROUND_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open2);
+  content::TestNavigationObserver load2(browser()->OpenURL(open2));
 
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
 
   // This shouldn't be able to discard a tab as the background tab has not yet
   // started loading (its URL is not committed).
   EXPECT_FALSE(tab_manager->DiscardTabImpl());
 
   // Wait for the background tab to load which then allows it to be discarded.
   load2.Wait();
   EXPECT_TRUE(tab_manager->DiscardTabImpl());
@@ skipping 158 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(TabManagerTest, AutoDiscardable) {
   using content::WindowedNotificationObserver;
   TabManager* tab_manager = g_browser_process->GetTabManager();
 
   // Disable the protection of recent tabs.
   tab_manager->set_minimum_protection_time_for_tests(
       base::TimeDelta::FromMinutes(0));
 
   // Get two tabs open.
-  WindowedNotificationObserver load1(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
                       WindowOpenDisposition::CURRENT_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open1);
+  content::TestNavigationObserver load1(browser()->OpenURL(open1));
   load1.Wait();
 
-  WindowedNotificationObserver load2(
-      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::NotificationService::AllSources());
   OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
                       WindowOpenDisposition::NEW_FOREGROUND_TAB,
                       ui::PAGE_TRANSITION_TYPED, false);
-  browser()->OpenURL(open2);
+  content::TestNavigationObserver load2(browser()->OpenURL(open2));
   load2.Wait();
 
   // Set the auto-discardable state of the first tab to false.
   auto tsm = browser()->tab_strip_model();
   ASSERT_EQ(2, tsm->count());
   tab_manager->SetTabAutoDiscardableState(tsm->GetWebContentsAt(0), false);
 
   // Shouldn't discard the tab, since auto-discardable is deactivated.
   EXPECT_FALSE(tab_manager->DiscardTabImpl());
 
   // Reset auto-discardable state to true.
   tab_manager->SetTabAutoDiscardableState(tsm->GetWebContentsAt(0), true);
 
   // Now it should be able to discard the tab.
   EXPECT_TRUE(tab_manager->DiscardTabImpl());
   EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
 }
 
 }  // namespace memory
 
 #endif  // OS_WIN || OS_MAXOSX || OS_LINUX