Revert of Ensure the new navigation classifier works in the real world.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 8ea65c35412c043dcdf6d1b815c79b3aadcf178c..0f5b5ce80f5c5d90e1363b53e76ea2395815b71d 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -788,15 +788,11 @@
 void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) {
   // Read the parameters out of the IPC message directly to avoid making another
   // copy when we filter the URLs.
-  ++commit_count_;
   base::PickleIterator iter(msg);
   FrameHostMsg_DidCommitProvisionalLoad_Params validated_params;
   if (!IPC::ParamTraits<FrameHostMsg_DidCommitProvisionalLoad_Params>::
-      Read(&msg, &iter, &validated_params)) {
-    base::debug::SetCrashKeyValue("369661-earlyreturn",
-                                  CommitCountString() + "/badipc");
-    return;
-  }
+      Read(&msg, &iter, &validated_params))
+    return;
   TRACE_EVENT1("navigation", "RenderFrameHostImpl::OnDidCommitProvisionalLoad",
                "url", validated_params.url.possibly_invalid_spec());
 
@@ -815,8 +811,6 @@
       !GetParent()) {
     base::TimeTicks approx_renderer_start_time = send_before_unload_start_time_;
     OnBeforeUnloadACK(true, approx_renderer_start_time, base::TimeTicks::Now());
-    base::debug::SetCrashKeyValue("369661-earlyreturn",
-                                  CommitCountString() + "/beforeunloadwait");
     return;
   }
 
@@ -825,11 +819,8 @@
   // unload request.  It will either respond to the unload request soon or our
   // timer will expire.  Either way, we should ignore this message, because we
   // have already committed to closing this renderer.
-  if (IsWaitingForUnloadACK()) {
-    base::debug::SetCrashKeyValue("369661-earlyreturn",
-                                  CommitCountString() + "/unloadwait");
-    return;
-  }
+  if (IsWaitingForUnloadACK())
+    return;
 
   if (validated_params.report_type ==
       FrameMsg_UILoadMetricsReportType::REPORT_LINK) {
@@ -881,8 +872,6 @@
           validated_params.page_state)) {
     bad_message::ReceivedBadMessage(
         GetProcess(), bad_message::RFH_CAN_ACCESS_FILES_OF_PAGE_STATE);
-    base::debug::SetCrashKeyValue("369661-earlyreturn",
-                                  CommitCountString() + "/fileaccess");
     return;
   }
 
@@ -2085,11 +2074,4 @@
   }
 }
 
-std::string RenderFrameHostImpl::CommitCountString() {
-  std::string result = base::Int64ToString(reinterpret_cast<int64_t>(this));
-  result += "/";
-  result += base::IntToString(commit_count_);
-  return result;
-}
-
 }  // namespace content