Ensure that all code paths which call FrameTreeNode::ResetNavigationRequest set NavigationHandle::G…

content/public/test/navigation_handle_observer.h

Index: content/public/test/navigation_handle_observer.h
diff --git a/content/public/test/navigation_handle_observer.h b/content/public/test/navigation_handle_observer.h
new file mode 100644
index 0000000000000000000000000000000000000000..749f4165ad3948944a1c56519d7ffda99d49e2b7
--- /dev/null
+++ b/content/public/test/navigation_handle_observer.h
@@ -0,0 +1,58 @@
+// Copyright 2017 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_NAVIGATION_HANDLE_OBSERVER_H_
+#define CONTENT_PUBLIC_TEST_NAVIGATION_HANDLE_OBSERVER_H_
+
+#include "base/macros.h"
+#include "content/public/browser/web_contents_observer.h"
+
+namespace content {
+
+// Gathers data from the NavigationHandle assigned to navigations that start
+// with the expected URL.
+class NavigationHandleObserver : public WebContentsObserver {
+ public:
+  NavigationHandleObserver(WebContents* web_contents,
+                           const GURL& expected_start_url);
+
+  void DidStartNavigation(NavigationHandle* navigation_handle) override;
+  void DidFinishNavigation(NavigationHandle* navigation_handle) override;
+
+  bool has_committed() { return has_committed_; }
+  bool is_error() { return is_error_; }
+  bool is_main_frame() { return is_main_frame_; }
+  bool is_parent_main_frame() { return is_parent_main_frame_; }
+  bool is_renderer_initiated() { return is_renderer_initiated_; }
+  bool is_same_document() { return is_same_document_; }
+  bool was_redirected() { return was_redirected_; }
+  int frame_tree_node_id() { return frame_tree_node_id_; }
+  const GURL& last_committed_url() { return last_committed_url_; }
+  ui::PageTransition page_transition() { return page_transition_; }
+  net::Error net_error_code() { return net_error_code_; }
+
+ private:
+  // A reference to the NavigationHandle so this class will track only
+  // one navigation at a time. It is set at DidStartNavigation and cleared
+  // at DidFinishNavigation before the NavigationHandle is destroyed.
+  NavigationHandle* handle_ = nullptr;
+  bool has_committed_ = false;
+  bool is_error_ = false;
+  bool is_main_frame_ = false;
+  bool is_parent_main_frame_ = false;
+  bool is_renderer_initiated_ = true;
+  bool is_same_document_ = false;
+  bool was_redirected_ = false;
+  int frame_tree_node_id_ = -1;
+  ui::PageTransition page_transition_ = ui::PAGE_TRANSITION_LINK;
+  GURL expected_start_url_;
+  GURL last_committed_url_;
+  net::Error net_error_code_ = net::OK;
+
+  DISALLOW_COPY_AND_ASSIGN(NavigationHandleObserver);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_TEST_NAVIGATION_HANDLE_OBSERVER_H_