Reland #2 Remove the is_loading_ field from WebContentsImpl

content/test/test_web_contents.cc

Index: content/test/test_web_contents.cc
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
index d712e5ff8ff85bc3a4c1e113feaf015d6e6e7dfb..d2c7243c9faff83c1a5949b564253d6d9aa7ea9b 100644
--- a/content/test/test_web_contents.cc
+++ b/content/test/test_web_contents.cc
@@ -189,7 +189,29 @@ void TestWebContents::NavigateAndCommit(const GURL& url) {
 }
 
 void TestWebContents::TestSetIsLoading(bool value) {
-  SetIsLoading(value, true, nullptr);
+  if (value)

[Charlie Reis, 2016/02/19 05:24:54]

Style nit: This needs braces (since the else block has braces).

[clamy, 2016/02/19 12:02:05]

Done.

+    DidStartLoading(GetMainFrame()->frame_tree_node(), true);
+  else {
+    for (FrameTreeNode* node : frame_tree_.Nodes()) {
+      RenderFrameHostImpl* current_frame_host =
+          node->render_manager()->current_frame_host();
+      DCHECK(current_frame_host);
+      current_frame_host->ResetLoadingState();
+
+      RenderFrameHostImpl* pending_frame_host =

[Charlie Reis, 2016/02/19 05:24:54]

nit: Why not declare this inside the else branch below?

[clamy, 2016/02/19 12:02:05]

Done.

+          node->render_manager()->pending_frame_host();
+
+      if (IsBrowserSideNavigationEnabled()) {
+        RenderFrameHostImpl* speculative_frame_host =
+            node->render_manager()->speculative_frame_host();
+        if (speculative_frame_host)
+          speculative_frame_host->ResetLoadingState();
+      } else {
+        if (pending_frame_host)
+          pending_frame_host->ResetLoadingState();
+      }
+    }
+  }
 }
 
 void TestWebContents::CommitPendingNavigation() {