| 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 e785d0a5730ab9c73655f2c9f575ac3d4838438d..0c89a13fb8538d1a9b14a0013e0bf57a8cea97b3 100644
|
| --- a/content/test/test_render_frame_host.cc
|
| +++ b/content/test/test_render_frame_host.cc
|
| @@ -321,8 +321,9 @@
|
| bool browser_side_navigation =
|
| base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableBrowserSideNavigation);
|
| - CHECK(!browser_side_navigation || is_loading());
|
| - CHECK(!browser_side_navigation || !frame_tree_node()->navigation_request());
|
| + CHECK_IMPLIES(browser_side_navigation, is_loading());
|
| + CHECK_IMPLIES(browser_side_navigation,
|
| + !frame_tree_node()->navigation_request());
|
| SendNavigate(page_id, 0, did_create_new_entry, url);
|
| }
|
|
|
| @@ -396,8 +397,8 @@
|
| int32 TestRenderFrameHost::ComputeNextPageID() {
|
| const NavigationEntryImpl* entry = static_cast<NavigationEntryImpl*>(
|
| frame_tree_node()->navigator()->GetController()->GetPendingEntry());
|
| - DCHECK(!(entry && entry->site_instance()) ||
|
| - entry->site_instance() == GetSiteInstance());
|
| + DCHECK_IMPLIES(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;
|
|
|