1 files changed, 3 insertions, 12 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index ff6adce..ceea01b 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -113,7 +113,6 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
       navigations_suspended_(false),
       suspended_nav_message_(NULL),
       run_modal_reply_msg_(NULL),
-      is_showing_before_unload_dialog_(false),
       is_waiting_for_unload_ack_(false),
       unload_ack_is_for_cross_site_transition_(false),
       are_javascript_messages_suppressed_(false),
@@ -263,7 +262,7 @@ void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) {
     // WebKit doesn't send throb notifications for JavaScript URLs, so we
     // don't want to either.
     if (!params.url.SchemeIs(chrome::kJavaScriptScheme))
-      delegate_->DidStartLoading(this);
+      delegate_->DidStartLoading();
   }
 }
 
@@ -587,13 +586,6 @@ void RenderViewHost::JavaScriptMessageBoxClosed(IPC::Message* reply_msg,
     StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
   }
 
-  if (is_showing_before_unload_dialog_ && !success) {
-    // If a beforeunload dialog is canceled, we need to stop the throbber from
-    // spinning, since we forced it to start spinning in Navigate.
-    delegate_->DidStopLoading(this);
-  }
-  is_showing_before_unload_dialog_ = false;
-
   ViewHostMsg_RunJavaScriptMessage::WriteReplyParams(reply_msg,
                                                      success, prompt);
   Send(reply_msg);
@@ -1026,11 +1018,11 @@ void RenderViewHost::OnMsgDidRedirectProvisionalLoad(int32 page_id,
 }
 
 void RenderViewHost::OnMsgDidStartLoading() {
-  delegate_->DidStartLoading(this);
+  delegate_->DidStartLoading();
 }
 
 void RenderViewHost::OnMsgDidStopLoading() {
-  delegate_->DidStopLoading(this);
+  delegate_->DidStopLoading();
 }
 
 void RenderViewHost::OnMsgDocumentAvailableInMainFrame() {
@@ -1336,7 +1328,6 @@ void RenderViewHost::OnMsgRunBeforeUnloadConfirm(const GURL& frame_url,
   // shouldn't process input events.
   process()->set_ignore_input_events(true);
   StopHangMonitorTimeout();
-  is_showing_before_unload_dialog_ = true;
   delegate_->RunBeforeUnloadConfirm(message, reply_msg);
 }