Reland: Remove DCHECK_IMPLIES/CHECK_IMPLIES.

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 644a6b6da270fde49a4aa8e450ae04c0801a599a..8b89efb3665f78493340e9d9ffd55c3997e65aff 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -627,7 +627,7 @@ void RenderFrameImpl::CreateFrame(
         replicated_state.sandbox_flags);
   }
   render_frame->SetWebFrame(web_frame);
-  CHECK_IMPLIES(parent_routing_id == MSG_ROUTING_NONE, !web_frame->parent());
+  CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent());
 
   WebFrame* opener = ResolveOpener(opener_routing_id, nullptr);
   web_frame->setOpener(opener);
@@ -1233,8 +1233,7 @@ void RenderFrameImpl::OnSwapOut(
       SiteIsolationPolicy::IsSwappedOutStateForbidden();
 
   // This codepath should only be hit for subframes when in --site-per-process.
-  CHECK_IMPLIES(!is_main_frame_,
-                SiteIsolationPolicy::AreCrossProcessFramesPossible());
+  CHECK(is_main_frame_ || SiteIsolationPolicy::AreCrossProcessFramesPossible());
 
   // Only run unload if we're not swapped out yet, but send the ack either way.
   if (!is_swapped_out_) {
@@ -2654,7 +2653,7 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
   DocumentState* document_state = DocumentState::FromDataSource(ds);
 
   // We should only navigate to swappedout:// when is_swapped_out_ is true.
-  CHECK_IMPLIES(ds->request().url() == GURL(kSwappedOutURL), is_swapped_out_)
+  CHECK(ds->request().url() != GURL(kSwappedOutURL) || is_swapped_out_)
       << "Heard swappedout:// when not swapped out.";
 
   // Update the request time if WebKit has better knowledge of it.
@@ -2820,9 +2819,8 @@ void RenderFrameImpl::didCommitProvisionalLoad(
     // SendUpdateState and update page_id_ even in this case, so that
     // the current entry gets a state update and so that we don't send a
     // state update to the wrong entry when we swap back in.
-    DCHECK_IMPLIES(
-        navigation_state->common_params().should_replace_current_entry,
-        render_view_->history_list_length_ > 0);
+    DCHECK(!navigation_state->common_params().should_replace_current_entry ||
+           render_view_->history_list_length_ > 0);
     if (GetLoadingUrl() != GURL(kSwappedOutURL) &&
         !navigation_state->common_params().should_replace_current_entry) {
       // Advance our offset in session history, applying the length limit.
@@ -4976,12 +4974,12 @@ void RenderFrameImpl::BeginNavigation(blink::WebURLRequest* request) {
             GetFetchCredentialsModeForWebURLRequest(*request));
   DCHECK(GetFetchRedirectModeForWebURLRequest(*request) ==
          FetchRedirectMode::MANUAL_MODE);
-  DCHECK_IMPLIES(!frame_->parent(),
-                 GetRequestContextFrameTypeForWebURLRequest(*request) ==
-                 REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL);
-  DCHECK_IMPLIES(frame_->parent(),
-                 GetRequestContextFrameTypeForWebURLRequest(*request) ==
-                 REQUEST_CONTEXT_FRAME_TYPE_NESTED);
+  DCHECK(frame_->parent() ||
+         GetRequestContextFrameTypeForWebURLRequest(*request) ==
+             REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL);
+  DCHECK(!frame_->parent() ||
+         GetRequestContextFrameTypeForWebURLRequest(*request) ==
+             REQUEST_CONTEXT_FRAME_TYPE_NESTED);
 
   Send(new FrameHostMsg_BeginNavigation(
       routing_id_,