Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

chrome/browser/captive_portal/captive_portal_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 <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 35 matching lines @@
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "net/http/transport_security_state.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/test_data_directory.h"
 #include "net/test/url_request/url_request_failed_job.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
@@ skipping 2042 matching lines @@
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   WebContents* broken_tab_contents = tab_strip_model->GetActiveWebContents();
 
   CaptivePortalObserver portal_observer(browser()->profile());
   FastErrorWithInterstitialTimer(browser(), cert_error_url);
 
   // Page appears loading. Reloading it cancels the page load. Since the load is
   // stopped, no cert error occurs and SSLErrorHandler isn't instantiated.
   MultiNavigationObserver test_navigation_observer;
   chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
-  test_navigation_observer.WaitForNavigations(2);
+  test_navigation_observer.WaitForNavigations(
+      content::IsBrowserSideNavigationEnabled() ? 1 : 2);
 
   // Make sure that the |ssl_error_handler| is deleted.
   EXPECT_TRUE(nullptr == SSLErrorHandler::FromWebContents(broken_tab_contents));
 
   EXPECT_FALSE(broken_tab_contents->ShowingInterstitialPage());
   EXPECT_FALSE(broken_tab_contents->IsLoading());
   EXPECT_EQ(0, portal_observer.num_results_received());
-  EXPECT_EQ(2, test_navigation_observer.num_navigations());
   EXPECT_EQ(0, NumLoadingTabs());
   EXPECT_FALSE(CheckPending(browser()));
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE,
             GetStateOfTabReloaderAt(browser(), 0));
 
   // Re-enable captive portal checks and fire one. The result should be ignored.
   RespondToProbeRequests(true);
   CaptivePortalObserver portal_observer2(browser()->profile());
   CaptivePortalService* captive_portal_service =
@@ skipping 31 matching lines @@
   CaptivePortalObserver portal_observer(browser()->profile());
   FastErrorWithInterstitialTimer(browser(), cert_error_url);
 
   // Page appears loading. Navigating away shouldn't result in any interstitial.
   // Can't use ui_test_utils::NavigateToURLWithDisposition because it waits for
   // a load stop notification before starting a new navigation.
   MultiNavigationObserver test_navigation_observer;
   browser()->OpenURL(content::OpenURLParams(
       URLRequestMockHTTPJob::GetMockUrl("title2.html"), content::Referrer(),
       WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
-  // Expect two navigations: First one for stopping the hanging page, second one
-  // for completing the load of the above navigation.
-  test_navigation_observer.WaitForNavigations(2);
+  // With PlzNavigate: expect one navigation.
+  // WIthout PlzNavigate: expect two navigations: First one for stopping the

[mmenke, 2016/09/23 21:41:18]

WIthout -> Without

[jam, 2016/09/23 21:49:22]

Done.

+  // hanging page, second one for completing the load of the above navigation.
+  test_navigation_observer.WaitForNavigations(
+      content::IsBrowserSideNavigationEnabled() ? 1 : 2);
 
   // Make sure that the |ssl_error_handler| is deleted.
   EXPECT_TRUE(nullptr == SSLErrorHandler::FromWebContents(broken_tab_contents));
 
   EXPECT_FALSE(broken_tab_contents->ShowingInterstitialPage());
   EXPECT_FALSE(broken_tab_contents->IsLoading());
   EXPECT_EQ(0, portal_observer.num_results_received());
-  EXPECT_EQ(2, test_navigation_observer.num_navigations());
   EXPECT_EQ(0, NumLoadingTabs());
   EXPECT_FALSE(CheckPending(browser()));
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE,
             GetStateOfTabReloaderAt(browser(), 0));
 
   // Re-enable captive portal checks and fire one. The result should be ignored.
   RespondToProbeRequests(true);
   CaptivePortalObserver portal_observer2(browser()->profile());
   CaptivePortalService* captive_portal_service =
@@ skipping 37 matching lines @@
   // to the same page. This should result in a cert error which should
   // instantiate an |SSLErrorHandler| and end up showing an SSL interstitial.
   RespondToProbeRequests(true);
   // Can't have ui_test_utils do the navigation because it will wait for loading
   // tabs to stop loading before navigating.
   CaptivePortalObserver portal_observer(browser()->profile());
   MultiNavigationObserver test_navigation_observer;
   browser()->OpenURL(content::OpenURLParams(cert_error_url, content::Referrer(),
                                             WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
-  // Expect two navigations: First one for stopping the hanging page, second one
-  // for completing the load of the above navigation.
-  test_navigation_observer.WaitForNavigations(2);
+  // With PlzNavigate: expect one navigation.
+  // WIthout PlzNavigate: expect two navigations: First one for stopping the

[mmenke, 2016/09/23 21:41:18]

Without

[jam, 2016/09/23 21:49:22]

Done.

+  // hanging page, second one for completing the load of the above navigation.
+  test_navigation_observer.WaitForNavigations(
+      content::IsBrowserSideNavigationEnabled() ? 1 : 2);
   // Should end up with an SSL interstitial.
   WaitForInterstitialAttach(broken_tab_contents);
   ASSERT_TRUE(broken_tab_contents->ShowingInterstitialPage());
   EXPECT_EQ(SSLBlockingPage::kTypeForTesting,
             broken_tab_contents->GetInterstitialPage()
                 ->GetDelegateForTesting()
                 ->GetTypeForTesting());
   EXPECT_FALSE(broken_tab_contents->IsLoading());
   EXPECT_EQ(1, portal_observer.num_results_received());
   EXPECT_EQ(captive_portal::RESULT_INTERNET_CONNECTED,
@@ skipping 30 matching lines @@
   // tabs to stop loading before navigating.
   CaptivePortalObserver portal_observer(browser()->profile());
   MultiNavigationObserver test_navigation_observer;
   browser()->OpenURL(content::OpenURLParams(cert_error_url, content::Referrer(),
                                             WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
   // Expect three navigations:
   // 1- For stopping the hanging page.
   // 2- For completing the load of the above navigation.
   // 3- For completing the load of the login tab.
-  test_navigation_observer.WaitForNavigations(3);
+  // NOTE: for PlzNaviate the first one doesn't show up.
+  test_navigation_observer.WaitForNavigations(
+      content::IsBrowserSideNavigationEnabled() ? 2 : 3);
   // Should end up with a captive portal interstitial and a new login tab.
   WaitForInterstitialAttach(broken_tab_contents);
   ASSERT_TRUE(broken_tab_contents->ShowingInterstitialPage());
   EXPECT_EQ(CaptivePortalBlockingPage::kTypeForTesting,
             broken_tab_contents->GetInterstitialPage()
                 ->GetDelegateForTesting()
                 ->GetTypeForTesting());
   ASSERT_EQ(initial_tab_count + 1, tab_strip_model->count());
   EXPECT_EQ(initial_tab_count, tab_strip_model->active_index());
   EXPECT_FALSE(broken_tab_contents->IsLoading());
@@ skipping 25 matching lines @@
   // of a captive portal error page.
   SSLErrorHandler::SetInterstitialDelayForTest(base::TimeDelta());
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   WebContents* broken_tab_contents = tab_strip_model->GetActiveWebContents();
 
   // Setting the delay to zero above has a race condition: A captive portal
   // result triggered by a cert error can arrive before the SSL interstitial
   // display timer is fired, even though it's set to zero.
   // To avoid this, disable captive portal checks until the SSL interstitial is
   // displayed. Once it's displayed, enable portal checks and fire one.
-  bool delay_portal_response_until_interstital = true;
+  // NOTE: this doesn't occur with PlzNavigate, since the SSL interstitial timer
+  // is fired synchronously due to different timings when
+  // CaptivePortalTabReloader gets the load start callback.
+  bool delay_portal_response_until_interstital =
+      !content::IsBrowserSideNavigationEnabled();
 
   // The path does not matter.
   GURL cert_error_url = https_server.GetURL(kTestServerLoginPath);
   // A captive portal check is triggered in FastErrorBehindCaptivePortal.
   FastErrorBehindCaptivePortal(
       browser(),
       true,
       cert_error_url,
       delay_portal_response_until_interstital);
 
@@ skipping 472 matching lines @@
 
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             GetStateOfTabReloaderAt(browser(), broken_tab_index));
 
   WaitForInterstitialAttach(broken_tab_contents);
   portal_observer.WaitForResults(1);
 
   EXPECT_EQ(SSLBlockingPage::kTypeForTesting,
             GetInterstitialType(broken_tab_contents));
 }