Improve the TestNavigationManager

content/public/test/browser_test_utils.h

 // Copyright (c) 2012 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_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
 
 #include <queue>
 #include <string>
 #include <vector>
@@ skipping 594 matching lines @@
 // mutliple instances of this class if you want to pause multiple navigations.
 class TestNavigationManager : public WebContentsObserver {
  public:
   // Monitors any frame in WebContents.
   TestNavigationManager(WebContents* web_contents, const GURL& url);
 
   ~TestNavigationManager() override;
 
   // Waits until the navigation request is ready to be sent to the network
   // stack. Returns false if the request was aborted before starting.
   WARN_UNUSED_RESULT bool WaitForWillStartRequest();

[nasko, 2016/10/12 23:53:58]

nit: WaitForStartRequest or WaitForRequestStart.

[clamy, 2016/10/13 15:51:55]

Done.

 
   // Waits until the navigation response has been sent received. Returns false
   // if the request was aborted before getting a response.
-  WARN_UNUSED_RESULT bool WaitForWillProcessResponse();
+  WARN_UNUSED_RESULT bool WaitForResponse();
 
   // Waits until the navigation has been finished. Will automatically resume
   // navigations paused before this point.
   void WaitForNavigationFinished();
 
  protected:
   // Derived classes can override if they want to filter out navigations. This
   // is called from DidStartNavigation.
   virtual bool ShouldMonitorNavigation(NavigationHandle* handle);
 
  private:
+  enum class NavigationState {
+    INITIAL = 0,
+    STARTED = 1,
+    RESPONSE = 2,
+    FINISHED = 3,
+  };
+
   // WebContentsObserver:
   void DidStartNavigation(NavigationHandle* handle) override;
   void DidFinishNavigation(NavigationHandle* handle) override;
 
   // Called when the NavigationThrottle pauses the navigation in
   // WillStartRequest.
   void OnWillStartRequest();
 
   // Called when the NavigationThrottle pauses the navigation in
   // WillProcessResponse.
   void OnWillProcessResponse();
 
-  // Resumes the navigation.
-  void ResumeNavigation();
+  // Waits for the desired state. Returns false if the desired state cannot be
+  // reached (eg the navigation finishes before reaching this state).
+  bool WaitForDesiredState();
+
+  // Called when the state of the navigation has changed. This will either stop
+  // the message loop if the state specified by the user has been reached, or
+  // resume the navigation if it hasn't been reached yet.
+  void OnNavigationStateChanged();
 
   const GURL url_;
-  bool navigation_paused_in_will_start_;
-  bool navigation_paused_in_will_process_response_;
   NavigationHandle* handle_;
-  bool handled_navigation_;
-  scoped_refptr<MessageLoopRunner> will_start_loop_runner_;
-  scoped_refptr<MessageLoopRunner> will_process_response_loop_runner_;
-  scoped_refptr<MessageLoopRunner> did_finish_loop_runner_;
+  bool navigation_paused_;
+  NavigationState current_state_;
+  NavigationState desired_state_;
+  scoped_refptr<MessageLoopRunner> loop_runner_;
 
   base::WeakPtrFactory<TestNavigationManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestNavigationManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_