Reland #1 Remove the is_loading_ field from WebContentsImpl

content/browser/frame_host/navigation_controller_impl_unittest.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/navigation_controller_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 3449 matching lines @@
   EXPECT_EQ(url, controller.GetPendingEntry()->GetURL());
   EXPECT_FALSE(controller.GetPendingEntry()->is_renderer_initiated());
   EXPECT_TRUE(controller.IsInitialNavigation());
   EXPECT_FALSE(contents()->HasAccessedInitialDocument());
 
   // There should be no title yet.
   EXPECT_TRUE(contents()->GetTitle().empty());
 
   // Suppose it aborts before committing, if it's a 204 or download or due to a
   // stop or a new navigation from the user.  The URL should remain visible.
-  FrameHostMsg_DidFailProvisionalLoadWithError_Params params;
-  params.error_code = net::ERR_ABORTED;
-  params.error_description = base::string16();
-  params.url = url;
-  params.showing_repost_interstitial = false;
-  main_test_rfh()->OnMessageReceived(
-      FrameHostMsg_DidFailProvisionalLoadWithError(0, params));
-  contents()->SetIsLoading(false, true, NULL);
+  if (IsBrowserSideNavigationEnabled()) {
+    static_cast<NavigatorImpl*>(main_test_rfh()->frame_tree_node()->navigator())
+        ->CancelNavigation(main_test_rfh()->frame_tree_node());
+  } else {
+    FrameHostMsg_DidFailProvisionalLoadWithError_Params params;
+    params.error_code = net::ERR_ABORTED;
+    params.error_description = base::string16();
+    params.url = url;
+    params.showing_repost_interstitial = false;
+    main_test_rfh()->OnMessageReceived(
+        FrameHostMsg_DidFailProvisionalLoadWithError(0, params));
+    main_test_rfh()->OnMessageReceived(FrameHostMsg_DidStopLoading(0));
+  }
   EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL());
 
   // If something else later modifies the contents of the about:blank page, then
   // we must revert to showing about:blank to avoid a URL spoof.
   main_test_rfh()->OnMessageReceived(FrameHostMsg_DidAccessInitialDocument(0));
   EXPECT_TRUE(contents()->HasAccessedInitialDocument());
   EXPECT_FALSE(controller.GetVisibleEntry());
   EXPECT_FALSE(controller.GetPendingEntry());
 
   notifications.Reset();
@@ skipping 1630 matching lines @@
   EXPECT_EQ(default_ssl_status.connection_status,
             details.ssl_status.connection_status);
   EXPECT_EQ(default_ssl_status.content_status,
             details.ssl_status.content_status);
   EXPECT_EQ(0u, details.ssl_status.signed_certificate_timestamp_ids.size());
 
   EXPECT_EQ(1, main_test_rfh()->GetProcess()->bad_msg_count());
 }
 
 }  // namespace content