Remove old diagnostic crash reports.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5007f28f5c19f40d05bae2cdb26a00a3940ca5de..7a9cad50c9712a5ea72c89fea7db40ce939a29d8 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1719,7 +1719,6 @@ void RenderFrameImpl::OnSwapOut(
 
   RenderViewImpl* render_view = render_view_;
   bool is_main_frame = is_main_frame_;
-  int routing_id = GetRoutingID();
 
   // Now that all of the cleanup is complete and the browser side is notified,
   // start using the RenderFrameProxy.
@@ -1732,20 +1731,13 @@ void RenderFrameImpl::OnSwapOut(
   // the necessary cleanup has happened anyway), but it might be possible for
   // it to return false without detaching.  Catch any cases that the
   // RenderView's main_render_frame_ isn't cleared below (whether swap returns
-  // false or not), to track down https://crbug.com/575245.
+  // false or not).
   bool success = frame_->swap(proxy->web_frame());
 
   // For main frames, the swap should have cleared the RenderView's pointer to
   // this frame.
-  if (is_main_frame) {
-    base::debug::SetCrashKeyValue("swapout_frame_id",
-                                  base::IntToString(routing_id));
-    base::debug::SetCrashKeyValue("swapout_proxy_id",
-                                  base::IntToString(proxy->routing_id()));
-    base::debug::SetCrashKeyValue(
-        "swapout_view_id", base::IntToString(render_view->GetRoutingID()));
+  if (is_main_frame)
     CHECK(!render_view->main_render_frame_);

[Charlie Reis, 2016/12/13 00:07:57]

I left this in place, since it seems like a useful safeguard for the future (and
I couldn't find cases of it getting hit).

[alexmos, 2016/12/13 20:28:55]

Acknowledged.

-  }
 
   if (!success) {
     // The swap can fail when the frame is detached during swap (this can
@@ -1770,7 +1762,7 @@ void RenderFrameImpl::OnSwapOut(
 
   // Notify the browser that this frame was swapped. Use the RenderThread
   // directly because |this| is deleted.
-  RenderThread::Get()->Send(new FrameHostMsg_SwapOut_ACK(routing_id));
+  RenderThread::Get()->Send(new FrameHostMsg_SwapOut_ACK(GetRoutingID()));
 }
 
 void RenderFrameImpl::OnDeleteFrame() {
@@ -3556,7 +3548,6 @@ void RenderFrameImpl::didCommitProvisionalLoad(
     if (!proxy)
       return;
 
-    int proxy_routing_id = proxy_routing_id_;
     if (!proxy->web_frame()->swap(frame_))
       return;
     proxy_routing_id_ = MSG_ROUTING_NONE;
@@ -3566,19 +3557,6 @@ void RenderFrameImpl::didCommitProvisionalLoad(
     // it needs to set RenderViewImpl's pointer for the main frame to itself
     // and ensure RenderWidget is no longer in swapped out mode.
     if (is_main_frame_) {
-      // Debug cases of https://crbug.com/575245.
-      base::debug::SetCrashKeyValue("commit_frame_id",
-                                    base::IntToString(GetRoutingID()));
-      base::debug::SetCrashKeyValue("commit_proxy_id",
-                                    base::IntToString(proxy_routing_id));
-      base::debug::SetCrashKeyValue(
-          "commit_view_id", base::IntToString(render_view_->GetRoutingID()));
-      if (render_view_->main_render_frame_) {
-        base::debug::SetCrashKeyValue(
-            "commit_main_render_frame_id",
-            base::IntToString(
-                render_view_->main_render_frame_->GetRoutingID()));
-      }
       CHECK(!render_view_->main_render_frame_);
       render_view_->main_render_frame_ = this;
       if (render_view_->is_swapped_out())