Reland #2 Remove the is_loading_ field from WebContentsImpl

content/test/web_contents_observer_sanity_checker.cc

 // Copyright 2014 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/web_contents_observer_sanity_checker.h"
 
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/common/frame_messages.h"
@@ skipping 312 matching lines @@
   return false;
 }
 
 void WebContentsObserverSanityChecker::WebContentsDestroyed() {
   CHECK(!web_contents_destroyed_);
   web_contents_destroyed_ = true;
   CHECK(ongoing_navigations_.empty());
   CHECK(active_media_players_.empty());
 }
 
+void WebContentsObserverSanityChecker::DidStartLoading() {
+  // TODO(clamy): add checks for the loading state in the rest of observer
+  // methods.
+  CHECK(!is_loading_);
+  CHECK(web_contents()->IsLoading());
+  is_loading_ = true;
+}
+
+void WebContentsObserverSanityChecker::DidStopLoading() {
+  CHECK(is_loading_);
+  CHECK(!web_contents()->IsLoading());
+  is_loading_ = false;
+}
+
 WebContentsObserverSanityChecker::WebContentsObserverSanityChecker(
     WebContents* web_contents)
-    : WebContentsObserver(web_contents), web_contents_destroyed_(false) {
-}
+    : WebContentsObserver(web_contents),
+      is_loading_(false),
+      web_contents_destroyed_(false) {}
 
 WebContentsObserverSanityChecker::~WebContentsObserverSanityChecker() {
   CHECK(web_contents_destroyed_);
 }
 
 void WebContentsObserverSanityChecker::AssertRenderFrameExists(
     RenderFrameHost* render_frame_host) {
   CHECK(!web_contents_destroyed_);
   GlobalRoutingID routing_pair = GetRoutingPair(render_frame_host);
 
@@ skipping 51 matching lines @@
       if (live_routes_.count(entry.first))
         return true;
       if (current_hosts_.count(entry.first))
         return true;
     }
   }
   return false;
 }
 
 }  // namespace content