Reland: Remove DCHECK_IMPLIES/CHECK_IMPLIES.

content/test/test_render_frame_host.cc

Index: content/test/test_render_frame_host.cc
diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc
index 0c89a13fb8538d1a9b14a0013e0bf57a8cea97b3..e785d0a5730ab9c73655f2c9f575ac3d4838438d 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -321,9 +321,8 @@ void TestRenderFrameHost::NavigateAndCommitRendererInitiated(
   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);
 }
 
@@ -397,8 +396,8 @@ void TestRenderFrameHost::PrepareForCommitWithServerRedirect(
 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;