Remove the is_loading_ field from WebContentsImpl

content/test/test_web_contents.cc

 // Copyright (c) 2012 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/test/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/page_state.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/test/test_render_view_host.h"
 #include "ui/base/page_transition_types.h"
 
 namespace content {
 
+namespace {
+
+bool UnsetLoadStateForTest(FrameTreeNode* node) {
+  RenderFrameHostImpl* current_frame_host =
+      node->render_manager()->current_frame_host();
+  DCHECK(current_frame_host);
+  current_frame_host->ResetLoadingState();
+
+  RenderFrameHostImpl* pending_frame_host =
+      node->render_manager()->pending_frame_host();
+  if (pending_frame_host)
+    pending_frame_host->ResetLoadingState();
+
+  if (IsBrowserSideNavigationEnabled()) {

[carlosk, 2016/01/15 17:24:04]

nit: same as the other case.

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

Done.

+    RenderFrameHostImpl* speculative_frame_host =
+        node->render_manager()->speculative_frame_host();
+    if (speculative_frame_host)
+      speculative_frame_host->ResetLoadingState();
+  }
+  return true;
+}
+
+}
+
 TestWebContents::TestWebContents(BrowserContext* browser_context)
     : WebContentsImpl(browser_context),
       delegate_view_override_(NULL),
       expect_set_history_offset_and_length_(false),
       expect_set_history_offset_and_length_history_length_(0) {
 }
 
 TestWebContents* TestWebContents::Create(BrowserContext* browser_context,
                                          SiteInstance* instance) {
   TestWebContents* test_web_contents = new TestWebContents(browser_context);
@@ skipping 143 matching lines @@
   GURL loaded_url(url);
   bool reverse_on_redirect = false;
   BrowserURLHandlerImpl::GetInstance()->RewriteURLIfNecessary(
       &loaded_url, GetBrowserContext(), &reverse_on_redirect);
   // LoadURL created a navigation entry, now simulate the RenderView sending
   // a notification that it actually navigated.
   CommitPendingNavigation();
 }
 
 void TestWebContents::TestSetIsLoading(bool value) {
-  SetIsLoading(value, true, nullptr);
+  if (value)
+    DidStartLoading(GetMainFrame()->frame_tree_node(), true);
+  else
+    frame_tree_.ForEach(base::Bind(&UnsetLoadStateForTest));
 }
 
 void TestWebContents::CommitPendingNavigation() {
   const NavigationEntry* entry = GetController().GetPendingEntry();
   DCHECK(entry);
 
   // If we are doing a cross-site navigation, this simulates the current RFH
   // notifying that it has unloaded so the pending RFH is resumed and can
   // navigate.
   // PlzNavigate: the pending RFH is not created before the navigation commit,
@@ skipping 119 matching lines @@
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 void TestWebContents::SaveFrameWithHeaders(const GURL& url,
                                            const Referrer& referrer,
                                            const std::string& headers) {
   save_frame_headers_ = headers;
 }
 
 }  // namespace content