Deflake RaceCrossOriginNavigationAndSamePageHistoryNavigation test.

content/test/content_browser_test_utils_internal.cc

Index: content/test/content_browser_test_utils_internal.cc
diff --git a/content/test/content_browser_test_utils_internal.cc b/content/test/content_browser_test_utils_internal.cc
index 447796106abf5d7ffab460651332c8e6515ea767..74c710d8e47fb3aa18549f8405e13c94f5d1afd8 100644
--- a/content/test/content_browser_test_utils_internal.cc
+++ b/content/test/content_browser_test_utils_internal.cc
@@ -20,6 +20,7 @@
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
+#include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 #include "content/browser/renderer_host/delegated_frame_host.h"
@@ -371,4 +372,27 @@ bool FrameTestNavigationManager::ShouldMonitorNavigation(
          handle->GetFrameTreeNodeId() == filtering_frame_tree_node_id_;
 }
 
+UrlCommitObserver::UrlCommitObserver(FrameTreeNode* frame_tree_node,
+                                     const GURL& url)
+    : content::WebContentsObserver(frame_tree_node->current_frame_host()
+                                       ->delegate()
+                                       ->GetAsWebContents()),
+      frame_tree_node_id_(frame_tree_node->frame_tree_node_id()),
+      url_(url),
+      message_loop_runner_(new MessageLoopRunner) {}
+
+UrlCommitObserver::~UrlCommitObserver() {}
+
+void UrlCommitObserver::Wait() {
+  message_loop_runner_->Run();
+}
+
+void UrlCommitObserver::DidFinishNavigation(
+    NavigationHandle* navigation_handle) {
+  if (navigation_handle->GetURL() == url_ &&

[Charlie Reis, 2016/09/26 20:58:38]

Do we care about checking HasCommitted(), to exclude canceled navigations?

[nasko, 2016/09/26 22:03:49]

And also error pages - yeah, I meant to do it and it slipped my mind. Added.

+      navigation_handle->GetFrameTreeNodeId() == frame_tree_node_id_) {
+    message_loop_runner_->Quit();
+  }
+}
+
 }  // namespace content