PlzNavigate: make RenderViewtest helper functions work

content/child/web_url_loader_impl.cc

 // Copyright 2014 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/child/web_url_loader_impl.h"
 
 #include <algorithm>
 #include <deque>
 #include <string>
 
@@ skipping 431 matching lines @@
   // browser.
   if (stream_override_.get()) {
     CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableBrowserSideNavigation));
     DCHECK(!sync_load_response);
     DCHECK_NE(WebURLRequest::FrameTypeNone, request.frameType());
     DCHECK_EQ("GET", request.httpMethod().latin1());
     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.
       sync_load_response->url = url;
       sync_load_response->error_code =
           GetInfoFromDataURL(sync_load_response->url, sync_load_response,
                              &sync_load_response->data);
     } else {
       task_runner_->PostTask(FROM_HERE,
                              base::Bind(&Context::HandleDataURL, this));
     }
     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();
 
   // TODO(brettw) this should take parameter encoding into account when
   // creating the GURLs.
 
   // TODO(horo): Check credentials flag is unset when credentials mode is omit.
   //             Check credentials flag is set when credentials mode is include.
 
@@ skipping 655 matching lines @@
                                          int intra_priority_value) {
   context_->DidChangePriority(new_priority, intra_priority_value);
 }
 
 bool WebURLLoaderImpl::attachThreadedDataReceiver(
     blink::WebThreadedDataReceiver* threaded_data_receiver) {
   return context_->AttachThreadedDataReceiver(threaded_data_receiver);
 }
 
 }  // namespace content