PlzNavigate: make RenderViewtest helper functions work

content/child/web_url_loader_impl.cc

Index: content/child/web_url_loader_impl.cc
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index e2cec70d33531e72ea4eb4d3a7a83f4120a9b233..a6a62c391bde72f6ae1e5a029df2c2df302f742c 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -449,13 +449,6 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
     url = stream_override_->stream_url;
   }
 
-  // PlzNavigate: the only navigation requests going through the WebURLLoader
-  // are the ones created by CommitNavigation.
-  DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kEnableBrowserSideNavigation) ||
-         stream_override_.get() ||
-         request.frameType() == WebURLRequest::FrameTypeNone);
-
   if (CanHandleDataURLRequestLocally()) {
     if (sync_load_response) {
       // This is a sync load. Do the work now.
@@ -470,6 +463,13 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
     return;
   }
 
+  // PlzNavigate: the only navigation requests going through the WebURLLoader
+  // are the ones created by CommitNavigation.
+  DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(

[clamy, 2015/04/08 14:19:30]

Several tests load HTML through a data url, requiring to move this CHECK after
deciding that we cannot handle the data url locally. Since its goal was to make
sure that we would not try to make normal resource requests to the browser for
frames if PlzNavigate, I think it is fine to move it there.

[Charlie Reis, 2015/04/09 00:47:40]

Sure.  Please update the comment, though, since there are now some navigation
requests going through here other than those created by CommitNavigation.

[clamy, 2015/04/09 15:55:06]

Done.

+             switches::kEnableBrowserSideNavigation) ||
+         stream_override_.get() ||
+         request.frameType() == WebURLRequest::FrameTypeNone);

[carlosk, 2015/04/08 15:16:42]

For clarity this should be updated to use (the recently discovered)
DCHECK_IMPLIES:

DCHECK_IMPLIES(base::CommandLine::ForCurrentProcess()->HasSwitch( 
                   switches::kEnableBrowserSideNavigation),
               stream_override_.get() || 
               request.frameType() == WebURLRequest::FrameTypeNone);

[clamy, 2015/04/09 15:55:06]

Done. Clearer indeed.

+
   GURL referrer_url(
       request.httpHeaderField(WebString::fromUTF8("Referer")).latin1());
   const std::string& method = request.httpMethod().latin1();