| Index: content/browser/frame_host/interstitial_page_impl.cc
|
| diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc
|
| index 9e63d829f1ae2fa5b32dbb9a8aeae248441e0e42..19067570c5850d5112e3a02db4efd1df8eb3b996 100644
|
| --- a/content/browser/frame_host/interstitial_page_impl.cc
|
| +++ b/content/browser/frame_host/interstitial_page_impl.cc
|
| @@ -178,7 +178,6 @@ InterstitialPageImpl::InterstitialPageImpl(
|
| original_child_id_(web_contents->GetRenderProcessHost()->GetID()),
|
| original_rvh_id_(web_contents->GetRenderViewHost()->GetRoutingID()),
|
| should_revert_web_contents_title_(false),
|
| - web_contents_was_loading_(false),
|
| resource_dispatcher_host_notified_(false),
|
| rvh_delegate_view_(new InterstitialPageRVHDelegateView(this)),
|
| create_view_(true),
|
| @@ -524,14 +523,6 @@ void InterstitialPageImpl::DidNavigate(
|
| // Hide the original RVH since we're showing the interstitial instead.
|
| rwh_view->Hide();
|
| }
|
| -
|
| - // Notify the tab we are not loading so the throbber is stopped. It also
|
| - // causes a WebContentsObserver::DidStopLoading callback that the
|
| - // AutomationProvider (used by the UI tests) expects to consider a navigation
|
| - // as complete. Without this, navigating in a UI test to a URL that triggers
|
| - // an interstitial would hang.
|
| - web_contents_was_loading_ = controller_->delegate()->IsLoading();
|
| - controller_->delegate()->SetIsLoading(false, true, NULL);
|
| }
|
|
|
| RendererPreferences InterstitialPageImpl::GetRendererPrefs(
|
| @@ -640,9 +631,7 @@ void InterstitialPageImpl::Proceed() {
|
| Disable();
|
| action_taken_ = PROCEED_ACTION;
|
|
|
| - // Resumes the throbber, if applicable.
|
| - if (web_contents_was_loading_)
|
| - controller_->delegate()->SetIsLoading(true, true, NULL);
|
| + controller_->delegate()->DidProceedOnInterstitial();
|
|
|
| // If this is a new navigation, the old page is going away, so we cancel any
|
| // blocked requests for it. If it is not a new navigation, then it means the
|
|
|