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

chrome/browser/ui/browser_instant_controller_unittest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/search/instant_unittest_base.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/reload_type.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/browser_side_navigation_policy.h"
 
 namespace chrome {
 
 namespace {
 
 class BrowserInstantControllerTest : public InstantUnitTestBase {
  public:
   void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
         "EmbeddedSearch", "Group1 use_cacheable_ntp:1"));
@@ skipping 39 matching lines @@
 
 
 class FakeWebContentsObserver : public content::WebContentsObserver {
  public:
   explicit FakeWebContentsObserver(content::WebContents* contents)
       : WebContentsObserver(contents),
         contents_(contents),
         url_(contents->GetURL()),
         num_reloads_(0) {}
 
+  void DidStartNavigation(
+      content::NavigationHandle* navigation_handle) override {
+    if (!content::IsBrowserSideNavigationEnabled())
+      return;
+    if (url_ == navigation_handle->GetURL())
+      num_reloads_++;
+    current_url_ = navigation_handle->GetURL();
+  }
+
+  // TODO: remove this method when PlzNavigate is turned on by default.
   void DidStartNavigationToPendingEntry(
       const GURL& url,
       content::ReloadType reload_type) override {
+    if (content::IsBrowserSideNavigationEnabled())
+      return;
     if (url_ == url)
       num_reloads_++;
     current_url_ = url;
   }
 
   const GURL& url() const { return url_; }
 
   const GURL& current_url() const { return contents_->GetURL(); }
 
   int num_reloads() const {
@@ skipping 124 matching lines @@
 
   browser.reset(NULL);
   window.reset(NULL);
   EXPECT_FALSE(IsInstantServiceObserver(bic))
     << "New BrowserInstantController should register as InstantServiceObserver";
 }
 
 }  // namespace
 
 }  // namespace chrome