Deflake RaceCrossOriginNavigationAndSamePageHistoryNavigation test.

content/test/content_browser_test_utils_internal.cc

 // 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.
 
 #include "content/test/content_browser_test_utils_internal.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/compositor/surface_utils.h"
 #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"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
@@ skipping 331 matching lines @@
     const GURL& url)
     : TestNavigationManager(web_contents, url),
       filtering_frame_tree_node_id_(filtering_frame_tree_node_id) {}
 
 bool FrameTestNavigationManager::ShouldMonitorNavigation(
     NavigationHandle* handle) {
   return TestNavigationManager::ShouldMonitorNavigation(handle) &&
          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