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

content/browser/web_contents/web_contents_view_aura_browsertest.cc

 // Copyright (c) 2012 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/browser/web_contents/web_contents_view_aura.h"
 
 #include <stddef.h>
 #include <tuple>
 
 #include "base/command_line.h"
@@ skipping 141 matching lines @@
   }
 
   RenderViewHost* screenshot_taken_for_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
   int waiting_for_screenshots_;
   std::map<NavigationEntryImpl*, bool> screenshot_set_;
 
   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()
       : BrowserMessageFilter(InputMsgStart),
         type_(blink::WebInputEvent::Undefined),
         state_(INPUT_EVENT_ACK_STATE_UNKNOWN) {}
 
   void WaitForAck(blink::WebInputEvent::Type type) {
     base::RunLoop run_loop;
     base::AutoReset<base::Closure> reset_quit(&quit_, run_loop.QuitClosure());
@@ skipping 637 matching lines @@
   EXPECT_TRUE(controller.CanGoForward());
 
   aura::Window* content = web_contents->GetContentNativeView();
   gfx::Rect bounds = content->GetBoundsInRootWindow();
   ui::test::EventGenerator generator(content->GetRootWindow(), content);
 
   // Do a swipe left to start a forward navigation. Then quickly do a swipe
   // 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),
       gfx::Point(bounds.right() - 10, bounds.y() + 10),
       base::TimeDelta::FromMilliseconds(2000),
       10);
   base::string16 actual_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, actual_title);
 
   EXPECT_EQ(2, GetCurrentIndex());
@@ skipping 260 matching lines @@
     details = dispatcher->OnEventFromSource(&release);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
 
     EXPECT_LT(0, tracker.num_overscroll_updates());
     EXPECT_FALSE(tracker.overscroll_completed());
   }
 }
 
 }  // namespace content