Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 2e7d77a987884907027c9592b092779f2be946ff..3d81f0c7a8069fefceebb8c33953b2ec3db1db7f 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -585,7 +585,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()); |
if (widget_params.routing_id != MSG_ROUTING_NONE) { |
CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( |
@@ -1126,7 +1126,7 @@ void RenderFrameImpl::OnSwapOut( |
bool is_main_frame = !frame_->parent(); |
// This codepath should only be hit for subframes when in --site-per-process. |
- CHECK_IMPLIES(!is_main_frame, is_site_per_process); |
+ CHECK(is_main_frame || is_site_per_process); |
// Only run unload if we're not swapped out yet, but send the ack either way. |
if (!is_swapped_out_) { |
@@ -2661,9 +2661,8 @@ void RenderFrameImpl::didCommitProvisionalLoad( |
// UpdateSessionHistory 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->start_params().should_replace_current_entry, |
- render_view_->history_list_length_ > 0); |
+ DCHECK(!navigation_state->start_params().should_replace_current_entry || |
+ render_view_->history_list_length_ > 0); |
if (GetLoadingUrl() != GURL(kSwappedOutURL) && |
!navigation_state->start_params().should_replace_current_entry) { |
// Advance our offset in session history, applying the length limit. |