Reland: Remove DCHECK_IMPLIES/CHECK_IMPLIES.

content/test/test_render_frame_host.cc

 // Copyright 2013 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/test_render_frame_host.h"
 
 #include "base/command_line.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request.h"
@@ skipping 303 matching lines @@
     const GURL& url) {
   SendRendererInitiatedNavigationRequest(url, false);
   // PlzNavigate: If no network request is needed by the navigation, then there
   // will be no NavigationRequest, nor is it necessary to simulate the network
   // stack commit.
   if (frame_tree_node()->navigation_request())
     PrepareForCommit();
   bool browser_side_navigation =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation);
-  CHECK_IMPLIES(browser_side_navigation, is_loading());
-  CHECK_IMPLIES(browser_side_navigation,
-                !frame_tree_node()->navigation_request());
+  CHECK(!browser_side_navigation || is_loading());
+  CHECK(!browser_side_navigation || !frame_tree_node()->navigation_request());
   SendNavigate(page_id, 0, did_create_new_entry, url);
 }
 
 void TestRenderFrameHost::SendRendererInitiatedNavigationRequest(
     const GURL& url,
     bool has_user_gesture) {
   // Since this is renderer-initiated navigation, the RenderFrame must be
   // initialized. Do it if it hasn't happened yet.
   InitializeRenderFrameIfNeeded();
 
@@ skipping 53 matching lines @@
   // Simulate the network stack commit.
   scoped_refptr<ResourceResponse> response(new ResourceResponse);
   // TODO(carlosk): ideally with PlzNavigate it should be possible someday to
   // fully commit the navigation at this call to CallOnResponseStarted.
   url_loader->CallOnResponseStarted(response, MakeEmptyStream());
 }
 
 int32 TestRenderFrameHost::ComputeNextPageID() {
   const NavigationEntryImpl* entry = static_cast<NavigationEntryImpl*>(
       frame_tree_node()->navigator()->GetController()->GetPendingEntry());
-  DCHECK_IMPLIES(entry && entry->site_instance(),
-                 entry->site_instance() == GetSiteInstance());
+  DCHECK(!(entry && entry->site_instance()) ||
+         entry->site_instance() == GetSiteInstance());
   // Entry can be null when committing an error page (the pending entry was
   // cleared during DidFailProvisionalLoad).
   int page_id = entry ? entry->GetPageID() : -1;
   if (page_id == -1) {
     WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
     page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
   }
   return page_id;
 }
 
 }  // namespace content