Remove the is_loading_ field from WebContentsImpl

content/browser/frame_host/frame_tree_node.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/frame_tree_node.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 380 matching lines @@
 
   render_manager_.Stop();
   return true;
 }
 
 void FrameTreeNode::DidFocus() {
   last_focus_time_ = base::TimeTicks::Now();
   FOR_EACH_OBSERVER(Observer, observers_, OnFrameTreeNodeFocused(this));
 }
 
+void FrameTreeNode::BeforeUnloadCanceled() {
+  if (!IsMainFrame())
+    return;
+
+  RenderFrameHostImpl* current_frame_host =
+      render_manager_.current_frame_host();
+  DCHECK(current_frame_host);
+  current_frame_host->ResetLoadingState();
+
+  RenderFrameHostImpl* pending_frame_host =
+      render_manager_.pending_frame_host();
+  if (pending_frame_host)
+    pending_frame_host->ResetLoadingState();

[nasko, 2016/01/16 00:13:51]

Do we need to touch the pending and speculative RFHs? If beforeunload was
canceled, then the navigation will be cancelled and those RFHs should disappear.

[clamy, 2016/01/19 13:31:18]

BrowserTest.CancelBeforeUnloadResetsURL is failing if we don't do so. It expects
the throbber to stop immediately when we close the dialog, not after an IPC
round trip.

+
+  if (IsBrowserSideNavigationEnabled()) {
+    RenderFrameHostImpl* speculative_frame_host =
+        render_manager_.speculative_frame_host();
+    if (speculative_frame_host)
+      speculative_frame_host->ResetLoadingState();
+  }
+}
+
+
 }  // namespace content