PlzNavigate: make all ResourceDispatcherHostTests pass

content/test/test_navigation_url_loader_delegate.h

Index: content/test/test_navigation_url_loader_delegate.h
diff --git a/content/test/test_navigation_url_loader_delegate.h b/content/test/test_navigation_url_loader_delegate.h
new file mode 100644
index 0000000000000000000000000000000000000000..7f64d55bc9bee3dd60b33169290d2e4d1279b224
--- /dev/null
+++ b/content/test/test_navigation_url_loader_delegate.h
@@ -0,0 +1,77 @@
+// Copyright 2016 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_TEST_TEST_NAVIGATION_URL_LOADER_DELEGATE_H_
+#define CONTENT_TEST_TEST_NAVIGATION_URL_LOADER_DELEGATE_H_
+
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/time/time.h"
+#include "content/browser/loader/navigation_url_loader_delegate.h"
+#include "net/url_request/redirect_info.h"
+
+namespace base {
+class RunLoop;
+}
+
+namespace content {
+
+class StreamHandle;
+struct ResourceResponse;
+
+// PlzNavigate
+// Test implementation of NavigationURLLoaderDelegate to monitor navigation
+// progress in the network stack.
+class TestNavigationURLLoaderDelegate : public NavigationURLLoaderDelegate {
+ public:
+  TestNavigationURLLoaderDelegate();
+  ~TestNavigationURLLoaderDelegate() override;
+
+  const net::RedirectInfo& redirect_info() const { return redirect_info_; }
+  ResourceResponse* redirect_response() const {
+    return redirect_response_.get();
+  }
+  ResourceResponse* response() const { return response_.get(); }
+  StreamHandle* body() const { return body_.get(); }
+  int net_error() const { return net_error_; }
+  int on_request_handled_counter() const { return on_request_handled_counter_; }
+
+  // Waits for various navigation events.
+  // Note: if the event already happened, this will fail.

[nasko, 2016/04/08 17:13:05]

nit: "this will fail" < what is "this"? How would we know "this" failed?

[clamy, 2016/04/11 11:47:38]

The functions will hang. Corrected the comment.

+  void WaitForRequestRedirected();
+  void WaitForResponseStarted();
+  void WaitForRequestFailed();
+  void WaitForRequestStarted();
+
+  void ReleaseBody();
+
+  // 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(bool in_cache, int net_error) override;
+  void OnRequestStarted(base::TimeTicks timestamp) override;
+
+ private:
+  net::RedirectInfo redirect_info_;
+  scoped_refptr<ResourceResponse> redirect_response_;
+  scoped_refptr<ResourceResponse> response_;
+  scoped_ptr<StreamHandle> body_;
+  int net_error_;
+  int on_request_handled_counter_;
+
+  scoped_ptr<base::RunLoop> request_redirected_;
+  scoped_ptr<base::RunLoop> response_started_;
+  scoped_ptr<base::RunLoop> request_failed_;
+  scoped_ptr<base::RunLoop> request_started_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestNavigationURLLoaderDelegate);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_TEST_TEST_NAVIGATION_URL_LOADER_DELEGATE_H