base: Remove the string logging from CHECK().

content/test/web_contents_observer_sanity_checker.cc

Index: content/test/web_contents_observer_sanity_checker.cc
diff --git a/content/test/web_contents_observer_sanity_checker.cc b/content/test/web_contents_observer_sanity_checker.cc
index ae9af67dc0e60f3940fa47bb76bd591838b4b08f..96e5d50fd8f66ce04a227a0e2b035f48689f97b0 100644
--- a/content/test/web_contents_observer_sanity_checker.cc
+++ b/content/test/web_contents_observer_sanity_checker.cc
@@ -47,18 +47,18 @@ void WebContentsObserverSanityChecker::RenderFrameCreated(
   deleted_routes_.erase(routing_pair);
 
   if (frame_exists) {
-    CHECK(false) << "RenderFrameCreated called more than once for routing pair:"
-                 << Format(render_frame_host);
+    // RenderFrameCreated called more than once for routing pair.
+    CHECK(false);
   }
 
-  CHECK(render_frame_host->GetProcess()->HasConnection())
-      << "RenderFrameCreated was called for a RenderFrameHost whose render "
-         "process is not currently live, so there's no way for the RenderFrame "
-         "to have been created.";
-  CHECK(
-      static_cast<RenderFrameHostImpl*>(render_frame_host)->IsRenderFrameLive())
-      << "RenderFrameCreated called on for a RenderFrameHost that thinks it is "
-         "not alive.";
+  // RenderFrameCreated was called for a RenderFrameHost whose render process is
+  // not currently live, so there's no way for the RenderFrame to have been
+  // created.
+  CHECK(render_frame_host->GetProcess()->HasConnection());
+  // RenderFrameCreated called on for a RenderFrameHost that thinks it is not
+  // alive.
+  CHECK(static_cast<RenderFrameHostImpl*>(render_frame_host)
+            ->IsRenderFrameLive());
 
   EnsureStableParentValue(render_frame_host);
   CHECK(!HasAnyChildren(render_frame_host));
@@ -67,10 +67,10 @@ void WebContentsObserverSanityChecker::RenderFrameCreated(
     GlobalRoutingID parent_routing_pair =
         GetRoutingPair(render_frame_host->GetParent());
 
-    CHECK(current_hosts_.count(parent_routing_pair))
-        << "RenderFrameCreated called for a RenderFrameHost whose parent was "
-        << "not a current RenderFrameHost. Only the current frame should be "
-        << "spawning children.";
+    // RenderFrameCreated called for a RenderFrameHost whose parent was not a
+    // current RenderFrameHost. Only the current frame should be spawning
+    // children.
+    CHECK(current_hosts_.count(parent_routing_pair));
   }
 }
 
@@ -82,12 +82,13 @@ void WebContentsObserverSanityChecker::RenderFrameDeleted(
   bool was_dead_already = !deleted_routes_.insert(routing_pair).second;
 
   if (was_dead_already) {
-    CHECK(false) << "RenderFrameDeleted called more than once for routing pair "
-                 << Format(render_frame_host);
+    // RenderFrameDeleted called more than once for routing pair
+    // |Format(render_frame_host)|
+    CHECK(false);
   } else if (!was_live) {
-    CHECK(false) << "RenderFrameDeleted called for routing pair "
-                 << Format(render_frame_host)
-                 << " for which RenderFrameCreated was never called";
+    // RenderFrameDeleted called for routing pair |Format(render_frame_host)|
+    // for which RenderFrameCreated was never called
+    CHECK(false);
   }
 
   EnsureStableParentValue(render_frame_host);
@@ -117,30 +118,28 @@ void WebContentsObserverSanityChecker::RenderFrameHostChanged(
     GlobalRoutingID routing_pair = GetRoutingPair(old_host);
     bool old_did_exist = !!current_hosts_.erase(routing_pair);
     if (!old_did_exist) {
-      CHECK(false)
-          << "RenderFrameHostChanged called with old host that did not exist:"
-          << Format(old_host);
+      // RenderFrameHostChanged called with old host that did not exist.
+      CHECK(false);
     }
-    CHECK(!HasAnyChildren(old_host))
-        << "All children should be detached before a parent is detached.";
+    // All children should be detached before a parent is detached.
+    CHECK(!HasAnyChildren(old_host));
   }
 
   EnsureStableParentValue(new_host);
   if (new_host->GetParent()) {
     AssertRenderFrameExists(new_host->GetParent());
-    CHECK(current_hosts_.count(GetRoutingPair(new_host->GetParent())))
-        << "Parent of frame being committed must be current.";
+    // Parent of frame being committed must be current.
+    CHECK(current_hosts_.count(GetRoutingPair(new_host->GetParent())));
   }
 
   GlobalRoutingID routing_pair = GetRoutingPair(new_host);
   bool host_exists = !current_hosts_.insert(routing_pair).second;
   if (host_exists) {
-    CHECK(false)
-        << "RenderFrameHostChanged called more than once for routing pair:"
-        << Format(new_host);
+    // RenderFrameHostChanged called more than once for routing pair.
+    CHECK(false);
   }
-  CHECK(!HasAnyChildren(new_host))
-      << "A frame should not have children before it is committed.";
+  // A frame should not have children before it is committed.
+  CHECK(!HasAnyChildren(new_host));
 }
 
 void WebContentsObserverSanityChecker::FrameDeleted(
@@ -151,12 +150,12 @@ void WebContentsObserverSanityChecker::FrameDeleted(
 
   EnsureStableParentValue(render_frame_host);
 
-  CHECK(!HasAnyChildren(render_frame_host))
-      << "All children should be deleted before a frame is detached.";
+  // All children should be deleted before a frame is detached.
+  CHECK(!HasAnyChildren(render_frame_host));
 
   GlobalRoutingID routing_pair = GetRoutingPair(render_frame_host);
-  CHECK(current_hosts_.erase(routing_pair))
-      << "FrameDeleted called with a non-current RenderFrameHost.";
+  // FrameDeleted called with a non-current RenderFrameHost.
+  CHECK(current_hosts_.erase(routing_pair));
 
   if (render_frame_host->GetParent())
     AssertRenderFrameExists(render_frame_host->GetParent());
@@ -355,14 +354,14 @@ void WebContentsObserverSanityChecker::AssertRenderFrameExists(
   bool render_frame_created_happened = live_routes_.count(routing_pair) != 0;
   bool render_frame_deleted_happened = deleted_routes_.count(routing_pair) != 0;
 
-  CHECK(render_frame_created_happened)
-      << "A RenderFrameHost pointer was passed to a WebContentsObserver "
-      << "method, but WebContentsObserver::RenderFrameCreated was never called "
-      << "for that RenderFrameHost: " << Format(render_frame_host);
-  CHECK(!render_frame_deleted_happened)
-      << "A RenderFrameHost pointer was passed to a WebContentsObserver "
-      << "method, but WebContentsObserver::RenderFrameDeleted had already been "
-      << "called on that frame:" << Format(render_frame_host);
+  // A RenderFrameHost pointer was passed to a WebContentsObserver method, but
+  // WebContentsObserver::RenderFrameCreated was never called for that
+  // RenderFrameHost.
+  CHECK(render_frame_created_happened);
+  // A RenderFrameHost pointer was passed to a WebContentsObserver method, but
+  // WebContentsObserver::RenderFrameDeleted had already been called on that
+  // frame.
+  CHECK(!render_frame_deleted_happened);
 }
 
 void WebContentsObserverSanityChecker::AssertMainFrameExists() {
@@ -394,8 +393,8 @@ void WebContentsObserverSanityChecker::EnsureStableParentValue(
     parent_ids_.insert(std::make_pair(routing_pair, parent_routing_pair));
   } else {
     GlobalRoutingID former_parent_routing_pair = it->second;
-    CHECK(former_parent_routing_pair == parent_routing_pair)
-        << "RFH's parent value changed over time! That is really not good!";
+    // RFH's parent value changed over time! That is really not good!
+    CHECK(former_parent_routing_pair == parent_routing_pair);
   }
 }