Reland: Remove DCHECK_IMPLIES/CHECK_IMPLIES.

chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
@@ skipping 109 matching lines @@
   }
 
   // Simulates an abort while requesting |url|.
   void SimulateAbort(const GURL& url,
                      NavigationType navigation_type) {
     EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsCryptographic()))
         .Times(1);
     content::WebContentsTester* web_contents_tester =
         content::WebContentsTester::For(web_contents());
     web_contents_tester->StartNavigation(url);
-    DCHECK_IMPLIES(navigation_type == kSameProcess, !pending_main_rfh());
+    DCHECK(navigation_type != kSameProcess || !pending_main_rfh());
 
     EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
     content::RenderFrameHost* rfh =
         navigation_type == kSameProcess ? main_rfh() : pending_main_rfh();
     content::RenderFrameHostTester* rfh_tester =
         content::RenderFrameHostTester::For(rfh);
     rfh_tester->SimulateNavigationError(url, net::ERR_ABORTED);
     // PlzNavigate: on abort, no renderer will have been associated with the
     // navigation. Therefore do not simulate a DidStopLoading IPC coming from a
     // renderer.
     if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableBrowserSideNavigation)) {
       rfh_tester->SimulateNavigationStop();
     }
 
     // Make sure that above call resulted in abort, for tests that continue
     // after the abort.
     EXPECT_CALL(mock_reloader(), OnAbort()).Times(0);
   }
 
   // Simulates an abort while loading an error page.
   void SimulateAbortTimeout(const GURL& url,
                             NavigationType navigation_type) {
     EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsCryptographic()))
         .Times(1);
     content::WebContentsTester* web_contents_tester =
         content::WebContentsTester::For(web_contents());
     web_contents_tester->StartNavigation(url);
-    DCHECK_IMPLIES(navigation_type == kSameProcess, !pending_main_rfh());
+    DCHECK(navigation_type != kSameProcess || !pending_main_rfh());
 
     EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
     content::RenderFrameHost* rfh =
         navigation_type == kSameProcess ? main_rfh() : pending_main_rfh();
     content::RenderFrameHostTester* rfh_tester =
         content::RenderFrameHostTester::For(rfh);
     rfh_tester->SimulateNavigationError(url, net::ERR_TIMED_OUT);
     rfh_tester->SimulateNavigationStop();
 
     // Make sure that above call resulted in abort, for tests that continue
@@ skipping 350 matching lines @@
   EXPECT_FALSE(tab_helper()->IsLoginTab());
 
   ObservePortalResult(captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL,
                       captive_portal::RESULT_NO_RESPONSE);
   EXPECT_FALSE(tab_helper()->IsLoginTab());
 
   ObservePortalResult(captive_portal::RESULT_NO_RESPONSE,
                       captive_portal::RESULT_INTERNET_CONNECTED);
   EXPECT_FALSE(tab_helper()->IsLoginTab());
 }