PlzNavigate: add support in several navigation controller unit tests

content/browser/frame_host/navigation_request.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/browser/frame_host/navigation_request.h"
 
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/loader/navigation_url_loader.h"
 #include "content/common/resource_request_body.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/stream_handle.h"
 #include "net/url_request/redirect_info.h"
 
 namespace content {
 
 NavigationRequest::NavigationRequest(
     FrameTreeNode* frame_tree_node,
     const CommonNavigationParams& common_params,
     const CommitNavigationParams& commit_params)
     : frame_tree_node_(frame_tree_node),
       common_params_(common_params),
-      commit_params_(commit_params) {
+      commit_params_(commit_params),
+      state_(NOT_STARTED) {
 }
 
 NavigationRequest::~NavigationRequest() {
 }
 
 void NavigationRequest::BeginNavigation(
     scoped_ptr<NavigationRequestInfo> info,
     scoped_refptr<ResourceRequestBody> request_body) {
   DCHECK(!loader_);
+  DCHECK(state_ == NOT_STARTED || state_ == WAITING_FOR_RENDERER_RESPONSE);
+  state_ = STARTED;
   loader_ = NavigationURLLoader::Create(
       frame_tree_node_->navigator()->GetController()->GetBrowserContext(),
       frame_tree_node_->frame_tree_node_id(), common_params_, info.Pass(),
       request_body.get(), this);
 
   // TODO(davidben): Fire (and add as necessary) observer methods such as
   // DidStartProvisionalLoadForFrame for the navigation.
 }
 
 void NavigationRequest::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     const scoped_refptr<ResourceResponse>& response) {
   // TODO(davidben): Track other changes from redirects. These are important
   // for, e.g., reloads.
   common_params_.url = redirect_info.new_url;
 
   // TODO(davidben): This where prerender and navigation_interceptor should be
   // integrated. For now, just always follow all redirects.
   loader_->FollowRedirect();
 }
 
 void NavigationRequest::OnResponseStarted(
     const scoped_refptr<ResourceResponse>& response,
     scoped_ptr<StreamHandle> body) {
+  state_ = RESPONSE_STARTED;

[nasko, 2014/12/16 01:40:26]

DCHECK that the request has started?

[clamy, 2014/12/17 15:47:57]

Done.

   frame_tree_node_->navigator()->CommitNavigation(frame_tree_node_,
                                                   response.get(), body.Pass());
 }
 
 void NavigationRequest::OnRequestFailed(int net_error) {
+  state_ = FAILED;

[nasko, 2014/12/16 01:40:26]

Similarly here, we shouldn't reach this code unless the state is STARTED, right?

[clamy, 2014/12/17 15:47:57]

Done.

   // TODO(davidben): Network failures should display a network error page.
   NOTIMPLEMENTED();
 }
 
 }  // namespace content