Reland: Remove DCHECK_IMPLIES/CHECK_IMPLIES.

content/renderer/render_frame_impl.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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 626 matching lines @@
     CHECK(proxy);
     render_frame = RenderFrameImpl::Create(proxy->render_view(), routing_id);
     web_frame =
         blink::WebLocalFrame::create(replicated_state.scope, render_frame);
     render_frame->proxy_routing_id_ = proxy_routing_id;
     web_frame->initializeToReplaceRemoteFrame(
         proxy->web_frame(), WebString::fromUTF8(replicated_state.name),
         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());
 
   WebFrame* opener = ResolveOpener(opener_routing_id, nullptr);
   web_frame->setOpener(opener);
 
   if (widget_params.routing_id != MSG_ROUTING_NONE) {
-    CHECK_IMPLIES(web_frame->parent(),
-                  SiteIsolationPolicy::AreCrossProcessFramesPossible());
+    CHECK(!web_frame->parent() ||
+          SiteIsolationPolicy::AreCrossProcessFramesPossible());
     render_frame->render_widget_ = RenderWidget::CreateForFrame(
         widget_params.routing_id, widget_params.hidden,
         render_frame->render_view_->screen_info(), compositor_deps, web_frame);
     // TODO(avi): The main frame re-uses the RenderViewImpl as its widget, so
     // avoid double-registering the frame as an observer.
     // https://crbug.com/545684
     if (web_frame->parent()) {
       // TODO(kenrb): Observing shouldn't be necessary when we sort out
       // WasShown and WasHidden, separating page-level visibility from
       // frame-level visibility.
@@ skipping 584 matching lines @@
 void RenderFrameImpl::OnSwapOut(
     int proxy_routing_id,
     bool is_loading,
     const FrameReplicationState& replicated_frame_state) {
   TRACE_EVENT1("navigation", "RenderFrameImpl::OnSwapOut", "id", routing_id_);
   RenderFrameProxy* proxy = NULL;
   bool swapped_out_forbidden =
       SiteIsolationPolicy::IsSwappedOutStateForbidden();
 
   // This codepath should only be hit for subframes when in --site-per-process.
-  CHECK_IMPLIES(!is_main_frame_,
-                SiteIsolationPolicy::AreCrossProcessFramesPossible());
+  CHECK(is_main_frame_ || SiteIsolationPolicy::AreCrossProcessFramesPossible());
 
   // Only run unload if we're not swapped out yet, but send the ack either way.
   if (!is_swapped_out_) {
     // Swap this RenderFrame out so the frame can navigate to a page rendered by
     // a different process.  This involves running the unload handler and
     // clearing the page.  We also allow this process to exit if there are no
     // other active RenderFrames in it.
 
     // Send an UpdateState message before we get swapped out.
     render_view_->SendUpdateState();
@@ skipping 1399 matching lines @@
   // callback is invoked.
   if (!ds)
     return;
 
   TRACE_EVENT2("navigation,benchmark",
                "RenderFrameImpl::didStartProvisionalLoad", "id", routing_id_,
                "url", ds->request().url().string().utf8());
   DocumentState* document_state = DocumentState::FromDataSource(ds);
 
   // We should only navigate to swappedout:// when is_swapped_out_ is true.
-  CHECK_IMPLIES(ds->request().url() == GURL(kSwappedOutURL), is_swapped_out_)
+  CHECK(ds->request().url() != GURL(kSwappedOutURL) || is_swapped_out_)
       << "Heard swappedout:// when not swapped out.";
 
   // Update the request time if WebKit has better knowledge of it.
   if (document_state->request_time().is_null() &&
           triggering_event_time != 0.0) {
     document_state->set_request_time(Time::FromDoubleT(triggering_event_time));
   }
 
   // Start time is only set after request time.
   document_state->set_start_load_time(Time::Now());
@@ skipping 145 matching lines @@
   if (is_new_navigation) {
     // We bump our Page ID to correspond with the new session history entry.
     render_view_->page_id_ = render_view_->next_page_id_++;
 
     // Don't update history list values for kSwappedOutURL, since
     // we don't want to forget the entry that was there, and since we will
     // never come back to kSwappedOutURL.  Note that we have to call
     // SendUpdateState 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->common_params().should_replace_current_entry,
-        render_view_->history_list_length_ > 0);
+    DCHECK(!navigation_state->common_params().should_replace_current_entry ||
+           render_view_->history_list_length_ > 0);
     if (GetLoadingUrl() != GURL(kSwappedOutURL) &&
         !navigation_state->common_params().should_replace_current_entry) {
       // Advance our offset in session history, applying the length limit.
       // There is now no forward history.
       render_view_->history_list_offset_++;
       if (render_view_->history_list_offset_ >= kMaxSessionHistoryEntries)
         render_view_->history_list_offset_ = kMaxSessionHistoryEntries - 1;
       render_view_->history_list_length_ =
           render_view_->history_list_offset_ + 1;
     }
@@ skipping 1142 matching lines @@
 
 void RenderFrameImpl::WasHidden() {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WasHidden());
 }
 
 void RenderFrameImpl::WasShown() {
   // TODO(kenrb): Need to figure out how to do this better. Should
   // VisibilityState remain a page-level concept or move to frames?
   // The semantics of 'Show' might have to change here.
   // TODO(avi): This DCHECK is to track cleanup for https://crbug.com/545684
-  DCHECK_IMPLIES(IsMainFrame(), render_widget_.get() == render_view_.get())
+  DCHECK(!IsMainFrame() || render_widget_.get() == render_view_.get())
       << "The main render frame is no longer reusing the RenderView as its "
       << "RenderWidget!";
   if (render_widget_ && render_view_.get() != render_widget_.get()) {
     static_cast<blink::WebFrameWidget*>(render_widget_->webwidget())->
         setVisibilityState(blink::WebPageVisibilityStateVisible, false);
   }
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WasShown());
 }
 
 void RenderFrameImpl::WidgetWillClose() {
@@ skipping 984 matching lines @@
   }
 
   // These values are assumed on the browser side for navigations. These checks
   // ensure the renderer has the correct values.
   DCHECK_EQ(FETCH_REQUEST_MODE_SAME_ORIGIN,
             GetFetchRequestModeForWebURLRequest(*request));
   DCHECK_EQ(FETCH_CREDENTIALS_MODE_INCLUDE,
             GetFetchCredentialsModeForWebURLRequest(*request));
   DCHECK(GetFetchRedirectModeForWebURLRequest(*request) ==
          FetchRedirectMode::MANUAL_MODE);
-  DCHECK_IMPLIES(!frame_->parent(),
-                 GetRequestContextFrameTypeForWebURLRequest(*request) ==
-                 REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL);
-  DCHECK_IMPLIES(frame_->parent(),
-                 GetRequestContextFrameTypeForWebURLRequest(*request) ==
-                 REQUEST_CONTEXT_FRAME_TYPE_NESTED);
+  DCHECK(frame_->parent() ||
+         GetRequestContextFrameTypeForWebURLRequest(*request) ==
+             REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL);
+  DCHECK(!frame_->parent() ||
+         GetRequestContextFrameTypeForWebURLRequest(*request) ==
+             REQUEST_CONTEXT_FRAME_TYPE_NESTED);
 
   Send(new FrameHostMsg_BeginNavigation(
       routing_id_,
       MakeCommonNavigationParams(request, should_replace_current_entry),
       BeginNavigationParams(
           request->httpMethod().latin1(), GetWebURLRequestHeaders(*request),
           GetLoadFlagsForWebURLRequest(*request), request->hasUserGesture(),
           request->skipServiceWorker(),
           GetRequestContextTypeForWebURLRequest(*request)),
       GetRequestBodyForWebURLRequest(*request)));
@@ skipping 255 matching lines @@
   mojo::ServiceProviderPtr service_provider;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(url);
   mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
                                     nullptr, nullptr,
                                     base::Bind(&OnGotContentHandlerID));
   return service_provider.Pass();
 }
 
 }  // namespace content