Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithCaptivePortalInterstitial
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithSSLInterstitial
CaptivePortalBrowserTest.InterstitialTimerReloadWhileLoading:
The following tests just need an adjustment in how many navigations they wait for. With PlzNavigate, when the renderer is navigated it doesn't send a FrameHostMsg_DidStopLoading IPC if it's loading. The tests were depending on that implementation detail, so they're updated now to handle both cases.

CaptivePortalBrowserTest.SSLCertErrorLogin:
With PlzNavigate, CaptivePortalTabReloader::OnLoadStart is called synchronously when a navigation occurs because of differences in the implementation details of NavigatorImpl::NavigateToEntry. Again, update the test to handle both cases.

BUG=504347
Committed: https://crrev.com/d9001a3e575a7d399509f621773d05bcb6fa20ae
Cr-Commit-Position: refs/heads/master@{#420777}

[jam, 2016-09-23 21:28:40]

The CQ bit was checked by jam@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-23 21:29:25]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[jam, 2016-09-23 21:29:33]

jam@chromium.org changed reviewers:
+ mmenke@chromium.org

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

LGTM

https://codereview.chromium.org/2365063002/diff/1/chrome/browser/captive_port...
File chrome/browser/captive_portal/captive_portal_browsertest.cc (right):

https://codereview.chromium.org/2365063002/diff/1/chrome/browser/captive_port...
chrome/browser/captive_portal/captive_portal_browsertest.cc:2180: // WIthout
PlzNavigate: expect two navigations: First one for stopping the
WIthout -> Without

https://codereview.chromium.org/2365063002/diff/1/chrome/browser/captive_port...
chrome/browser/captive_portal/captive_portal_browsertest.cc:2249: // WIthout
PlzNavigate: expect two navigations: First one for stopping the
Without

[commit-bot: I haz the power, 2016-09-23 21:42:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-23 21:42:38]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)

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

https://codereview.chromium.org/2365063002/diff/1/chrome/browser/captive_port...
File chrome/browser/captive_portal/captive_portal_browsertest.cc (right):

https://codereview.chromium.org/2365063002/diff/1/chrome/browser/captive_port...
chrome/browser/captive_portal/captive_portal_browsertest.cc:2180: // WIthout
PlzNavigate: expect two navigations: First one for stopping the
On 2016/09/23 21:41:18, mmenke wrote:
> WIthout -> Without

Done.

https://codereview.chromium.org/2365063002/diff/1/chrome/browser/captive_port...
chrome/browser/captive_portal/captive_portal_browsertest.cc:2249: // WIthout
PlzNavigate: expect two navigations: First one for stopping the
On 2016/09/23 21:41:18, mmenke wrote:
> Without

Done.

[jam, 2016-09-23 21:50:59]

Description was changed from

==========
Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithCaptivePortalInterstitial
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithSSLInterstitial
CaptivePortalBrowserTest.InterstitialTimerReloadWhileLoading:
The following tests just need an adjustment in how many navigations they wait
for. With PlzNavigate, when the renderer is navigated it doesn't a
FrameHostMsg_DidStopLoading IPC if it's loading. The tests were depending on
that implementation detail, so they're updated now to handle both cases.

CaptivePortalBrowserTest.SSLCertErrorLogin:
With PlzNavigate, CaptivePortalTabReloader::OnLoadStart is called synchronously
when a navigation occurs because of differences in the implementation details of
NavigatorImpl::NavigateToEntry. Again, update the test to handle both cases.

BUG=504347
==========

to

==========
Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithCaptivePortalInterstitial
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithSSLInterstitial
CaptivePortalBrowserTest.InterstitialTimerReloadWhileLoading:
The following tests just need an adjustment in how many navigations they wait
for. With PlzNavigate, when the renderer is navigated it doesn't send a
FrameHostMsg_DidStopLoading IPC if it's loading. The tests were depending on
that implementation detail, so they're updated now to handle both cases.

CaptivePortalBrowserTest.SSLCertErrorLogin:
With PlzNavigate, CaptivePortalTabReloader::OnLoadStart is called synchronously
when a navigation occurs because of differences in the implementation details of
NavigatorImpl::NavigateToEntry. Again, update the test to handle both cases.

BUG=504347
==========

[jam, 2016-09-23 21:51:04]

The CQ bit was checked by jam@chromium.org

[jam, 2016-09-23 21:51:05]

The patchset sent to the CQ was uploaded after l-g-t-m from mmenke@chromium.org
Link to the patchset: https://codereview.chromium.org/2365063002/#ps20001
(title: "review comments")

[commit-bot: I haz the power, 2016-09-23 21:51:51]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-23 23:19:05]

Description was changed from

==========
Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithCaptivePortalInterstitial
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithSSLInterstitial
CaptivePortalBrowserTest.InterstitialTimerReloadWhileLoading:
The following tests just need an adjustment in how many navigations they wait
for. With PlzNavigate, when the renderer is navigated it doesn't send a
FrameHostMsg_DidStopLoading IPC if it's loading. The tests were depending on
that implementation detail, so they're updated now to handle both cases.

CaptivePortalBrowserTest.SSLCertErrorLogin:
With PlzNavigate, CaptivePortalTabReloader::OnLoadStart is called synchronously
when a navigation occurs because of differences in the implementation details of
NavigatorImpl::NavigateToEntry. Again, update the test to handle both cases.

BUG=504347
==========

to

==========
Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithCaptivePortalInterstitial
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithSSLInterstitial
CaptivePortalBrowserTest.InterstitialTimerReloadWhileLoading:
The following tests just need an adjustment in how many navigations they wait
for. With PlzNavigate, when the renderer is navigated it doesn't send a
FrameHostMsg_DidStopLoading IPC if it's loading. The tests were depending on
that implementation detail, so they're updated now to handle both cases.

CaptivePortalBrowserTest.SSLCertErrorLogin:
With PlzNavigate, CaptivePortalTabReloader::OnLoadStart is called synchronously
when a navigation occurs because of differences in the implementation details of
NavigatorImpl::NavigateToEntry. Again, update the test to handle both cases.

BUG=504347
==========

[commit-bot: I haz the power, 2016-09-23 23:19:06]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-09-23 23:21:49]

Description was changed from

==========
Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithCaptivePortalInterstitial
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithSSLInterstitial
CaptivePortalBrowserTest.InterstitialTimerReloadWhileLoading:
The following tests just need an adjustment in how many navigations they wait
for. With PlzNavigate, when the renderer is navigated it doesn't send a
FrameHostMsg_DidStopLoading IPC if it's loading. The tests were depending on
that implementation detail, so they're updated now to handle both cases.

CaptivePortalBrowserTest.SSLCertErrorLogin:
With PlzNavigate, CaptivePortalTabReloader::OnLoadStart is called synchronously
when a navigation occurs because of differences in the implementation details of
NavigatorImpl::NavigateToEntry. Again, update the test to handle both cases.

BUG=504347
==========

to

==========
Fix CaptivePortalBrowserTest browser tests with PlzNavigate.

CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithCaptivePortalInterstitial
CaptivePortalBrowserTest.InterstitialTimerNavigateWhileLoading_EndWithSSLInterstitial
CaptivePortalBrowserTest.InterstitialTimerReloadWhileLoading:
The following tests just need an adjustment in how many navigations they wait
for. With PlzNavigate, when the renderer is navigated it doesn't send a
FrameHostMsg_DidStopLoading IPC if it's loading. The tests were depending on
that implementation detail, so they're updated now to handle both cases.

CaptivePortalBrowserTest.SSLCertErrorLogin:
With PlzNavigate, CaptivePortalTabReloader::OnLoadStart is called synchronously
when a navigation occurs because of differences in the implementation details of
NavigatorImpl::NavigateToEntry. Again, update the test to handle both cases.

BUG=504347

Committed: https://crrev.com/d9001a3e575a7d399509f621773d05bcb6fa20ae
Cr-Commit-Position: refs/heads/master@{#420777}
==========

[commit-bot: I haz the power, 2016-09-23 23:21:50]

Patchset 2 (id:??) landed as
https://crrev.com/d9001a3e575a7d399509f621773d05bcb6fa20ae
Cr-Commit-Position: refs/heads/master@{#420777}