Convert tests to use the non-deprecated WebContentsObserver navigation methods.

content/browser/web_contents/web_contents_view_aura_browsertest.cc

Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
index 88785e40412260eace366f13d59ea528f1d17865..ea911422863f97c33d9a29c8e4b4f85ef038b983 100644
--- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
+++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
@@ -159,38 +159,6 @@ class ScreenshotTracker : public NavigationEntryScreenshotManager {
   DISALLOW_COPY_AND_ASSIGN(ScreenshotTracker);
 };
 
-class NavigationWatcher : public WebContentsObserver {
- public:
-  explicit NavigationWatcher(WebContents* contents)
-      : WebContentsObserver(contents),
-        navigated_(false),
-        should_quit_loop_(false) {
-  }
-
-  ~NavigationWatcher() override {}
-
-  void WaitUntilNavigationStarts() {
-    if (navigated_)
-      return;
-    should_quit_loop_ = true;
-    base::RunLoop().Run();
-  }
-
- private:
-  // Overridden from WebContentsObserver:
-  void DidStartNavigationToPendingEntry(const GURL& validated_url,
-                                        ReloadType reload_type) override {
-    navigated_ = true;
-    if (should_quit_loop_)
-      base::MessageLoop::current()->QuitWhenIdle();
-  }
-
-  bool navigated_;
-  bool should_quit_loop_;
-
-  DISALLOW_COPY_AND_ASSIGN(NavigationWatcher);
-};
-
 class InputEventMessageFilterWaitsForAcks : public BrowserMessageFilter {
  public:
   InputEventMessageFilterWaitsForAcks()
@@ -848,14 +816,15 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
   // right.
   base::string16 expected_title = base::ASCIIToUTF16("Title: #2");
   content::TitleWatcher title_watcher(web_contents, expected_title);
-  NavigationWatcher nav_watcher(web_contents);
+  TestNavigationManager nav_watcher(web_contents,
+      embedded_test_server()->GetURL("/overscroll_navigation.html#2"));
 
   generator.GestureScrollSequence(
       gfx::Point(bounds.right() - 10, bounds.y() + 10),
       gfx::Point(bounds.x() + 2, bounds.y() + 10),
       base::TimeDelta::FromMilliseconds(2000),
       10);
-  nav_watcher.WaitUntilNavigationStarts();
+  nav_watcher.WaitForNavigationFinished();

[clamy, 2017/01/19 14:59:37]

This doesn't correspond to the same point in time in navigation.
WaitForNavigationFinished waits until the navigation commits or gets canceled.

[jam, 2017/01/20 05:52:16]

I originally tried  WaitForRequestStart() to keep same behavior as before, but
that didn't work since the testnavigationmanager didn't get it and only got
finished, so it returned false in WaitForDesiredState.

This doesn't actually matter though, since this is a test and if we wait a
little bit longer than before, that's fine.

 
   generator.GestureScrollSequence(
       gfx::Point(bounds.x() + 2, bounds.y() + 10),