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

chrome/browser/ui/browser_browsertest.cc

 // Copyright 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 "chrome/browser/ui/browser.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 265 matching lines @@
   void set_wcv_resize_insets(const gfx::Size& wcv_resize_insets) {
     wcv_resize_insets_ = wcv_resize_insets;
   }
 
   // Cache the size when RenderViewHost is first created.
   void RenderViewCreated(content::RenderViewHost* render_view_host) override {
     render_view_sizes_[render_view_host].rwhv_create_size =
         render_view_host->GetWidget()->GetView()->GetViewBounds().size();
   }
 
+  void DidStartNavigationToPendingEntry(
+      const GURL& url,
+      content::ReloadType reload_type) override {
+    // TODO: remove this method when PlzNavigate is turned on by default.
+    if (!content::IsBrowserSideNavigationEnabled())
+      Resize();
+  }
+
   // Enlarge WebContentsView by |wcv_resize_insets_| while the navigation entry
   // is pending.
-  void DidStartNavigationToPendingEntry(
-      const GURL& url,
-      content::ReloadType reload_type) override {
+  void DidStartNavigation(
+      content::NavigationHandle* navigation_handle) override {
+    if (content::IsBrowserSideNavigationEnabled())
+      Resize();
+  }
+
+  void Resize() {
     if (wcv_resize_insets_.IsEmpty())
       return;
     // Resizing the main browser window by |wcv_resize_insets_| will
     // automatically resize the WebContentsView by the same amount.
     // Just resizing WebContentsView directly doesn't work on Linux, because the
     // next automatic layout of the browser window will resize WebContentsView
     // back to the previous size.  To make it consistent, resize main browser
     // window on all platforms.
     gfx::Rect bounds(browser_window_->GetBounds());
     gfx::Size size(bounds.size());
@@ skipping 19 matching lines @@
  private:
   struct Sizes {
     gfx::Size rwhv_create_size;  // Size of RenderWidgetHostView when created.
     gfx::Size rwhv_commit_size;  // Size of RenderWidgetHostView when committed.
     gfx::Size wcv_commit_size;   // Size of WebContentsView when committed.
   };
 
   typedef std::map<content::RenderViewHost*, Sizes> RenderViewSizes;
   RenderViewSizes render_view_sizes_;
   // Enlarge WebContentsView by this size insets in
-  // DidStartNavigationToPendingEntry.
+  // DidStartNavigation.
   gfx::Size wcv_resize_insets_;
   BrowserWindow* browser_window_;  // Weak ptr.
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewSizeObserver);
 };
 
 // Waits for a failed commit notification.
 class FailedCommitWatcher : public content::WebContentsObserver {
 public:
   explicit FailedCommitWatcher(content::WebContents* wc)
@@ skipping 2551 matching lines @@
     Browser* browser = new Browser(params);
     gfx::Rect bounds = browser->window()->GetBounds();
 
     // Should be EXPECT_EQ, but this width is inconsistent across platforms.
     // See https://crbug.com/567925.
     EXPECT_GE(bounds.width(), 100);
     EXPECT_EQ(122, bounds.height());
     browser->window()->Close();
   }
 }