Deflake RaceCrossOriginNavigationAndSamePageHistoryNavigation test.

content/test/content_browser_test_utils_internal.h

 // 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.
 
 #ifndef CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_
 #define CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_
 
 // A collection of functions designed for use with content_shell based browser
 // tests internal to the content/ module.
 // Note: If a function here also works with browser_tests, it should be in
@@ skipping 156 matching lines @@
  private:
   // TestNavigationManager:
   bool ShouldMonitorNavigation(NavigationHandle* handle) override;
 
   // Notifications are filtered so only this frame is monitored.
   int filtering_frame_tree_node_id_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameTestNavigationManager);
 };
 
+// An observer that can wait for a specific URL to be committed in a specific
+// frame.
+// Note: it does not track the start of a navigation, unlike other observers.
+class UrlCommitObserver : WebContentsObserver {
+ public:
+  explicit UrlCommitObserver(FrameTreeNode* frame_tree_node, const GURL& url);
+  ~UrlCommitObserver() override;
+
+  void Wait();
+
+ private:
+  void DidFinishNavigation(NavigationHandle* navigation_handle) override;
+
+  // The id of the FrameTreeNode in which navigations are peformed.
+  int frame_tree_node_id_;
+
+  // The URL this observer is expecting to be committed.
+  GURL url_;
+
+  // The MessageLoopRunner used to spin the message loop.
+  scoped_refptr<MessageLoopRunner> message_loop_runner_;
+
+  DISALLOW_COPY_AND_ASSIGN(UrlCommitObserver);
+};
+
 }  // namespace content
 
 #endif  // CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_