PlzNavigate: add support in several navigation controller unit tests

content/browser/frame_host/navigation_request.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/loader/navigation_url_loader_delegate.h"
 #include "content/common/content_export.h"
 #include "content/common/navigation_params.h"
 
 namespace content {
 
 class FrameTreeNode;
 class NavigationURLLoader;
 class ResourceRequestBody;
 struct NavigationRequestInfo;
 
 // PlzNavigate
 // A UI thread object that owns a navigation request until it commits. It
 // ensures the UI thread can start a navigation request in the
 // ResourceDispatcherHost (that lives on the IO thread).
 // TODO(clamy): Describe the interactions between the UI and IO thread during
 // the navigation following its refactoring.
 class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate {
  public:
+  enum NavigationState {

[clamy, 2014/12/15 17:01:39]

I actually plan to use this enum for things other than tests in the future. Also
it helps when checking that navigation proceeds correctly.

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

Let's put a comment explaining the goal/usage of it and the states. Some are
clear, but some could mean different things, so documenting precisely the
meaning will be very useful.

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

Done.

+    NOT_STARTED = 0,
+    WAITING_FOR_RENDERER_RESPONSE,
+    STARTED,
+    RESPONSE_STARTED,
+    FAILED,
+  };
+
   NavigationRequest(FrameTreeNode* frame_tree_node,
                     const CommonNavigationParams& common_params,
                     const CommitNavigationParams& commit_params);
 
   ~NavigationRequest() override;
 
   // Called on the UI thread by the RenderFrameHostManager which owns the
   // NavigationRequest. Takes ownership of |info|. After calling this function,
   // |body| can no longer be manipulated on the UI thread.
   void BeginNavigation(scoped_ptr<NavigationRequestInfo> info,
                        scoped_refptr<ResourceRequestBody> body);
 
   CommonNavigationParams& common_params() { return common_params_; }
 
   const CommitNavigationParams& commit_params() const { return commit_params_; }
 
   NavigationURLLoader* loader_for_testing() const { return loader_.get(); }
 
+  NavigationState state() const { return state_; }
+
+  void SetWaitingForRendererResponse() {

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

Do we not expect to have other states being set externally?

[clamy, 2014/12/16 19:19:05]

No the other states are set because of the interactions with the IO thread
(beginning the request on the IO thread, and the response being ready to commit
or the request failing).

[nasko, 2014/12/17 00:55:02]

Acknowledged.

+    state_ = WAITING_FOR_RENDERER_RESPONSE;
+  }
+
  private:
   // NavigationURLLoaderDelegate implementation.
   void OnRequestRedirected(
       const net::RedirectInfo& redirect_info,
       const scoped_refptr<ResourceResponse>& response) override;
   void OnResponseStarted(const scoped_refptr<ResourceResponse>& response,
                          scoped_ptr<StreamHandle> body) override;
   void OnRequestFailed(int net_error) override;
 
   FrameTreeNode* frame_tree_node_;
 
   // Initialized on creation of the NavigationRequest. Sent to the renderer when
   // the navigation is ready to commit.
   // Note: When the navigation is ready to commit, the url in |common_params|
   // will be set to the final navigation url, obtained after following all
   // redirects.
   CommonNavigationParams common_params_;
   const CommitNavigationParams commit_params_;
 
+  NavigationState state_;
+
   scoped_ptr<NavigationURLLoader> loader_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationRequest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_