Fix pushState causing stop/reload button and favicon to flicker.

content/browser/frame_host/interstitial_page_impl.cc

 // Copyright 2013 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 "content/browser/frame_host/interstitial_page_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 418 matching lines @@
     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(
-      controller_->delegate()->GetRenderViewHost(), false, NULL);
+      controller_->delegate()->GetRenderViewHost(), false, true, NULL);
 }
 
 void InterstitialPageImpl::UpdateTitle(
     RenderViewHost* render_view_host,
     int32 page_id,
     const base::string16& title,
     base::i18n::TextDirection title_direction) {
   if (!enabled())
     return;
 
@@ skipping 124 matching lines @@
   if (action_taken_ != NO_ACTION) {
     NOTREACHED();
     return;
   }
   Disable();
   action_taken_ = PROCEED_ACTION;
 
   // Resumes the throbber, if applicable.
   if (web_contents_was_loading_)
     controller_->delegate()->SetIsLoading(
-        controller_->delegate()->GetRenderViewHost(), true, NULL);
+        controller_->delegate()->GetRenderViewHost(), true, true, NULL);
 
   // 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
   // interstitial was shown as a result of a resource loading in the page.
   // Since the user wants to proceed, we'll let any blocked request go through.
   if (new_navigation_)
     TakeActionOnResourceDispatcher(CANCEL);
   else
     TakeActionOnResourceDispatcher(RESUME);
 
@@ skipping 258 matching lines @@
 
   web_contents->GetDelegateView()->TakeFocus(reverse);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }
 
 }  // namespace content