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

chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc

 // 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.
 
 #include "chrome/browser/ui/sync/one_click_signin_sync_observer.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/browser_sync/test_profile_sync_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/sync/driver/startup_controller.h"
 #include "content/public/browser/reload_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace {
 
 const char kContinueUrl[] = "https://www.example.com/";
 
 class MockWebContentsObserver : public content::WebContentsObserver {
  public:
   explicit MockWebContentsObserver(content::WebContents* web_contents)
       : content::WebContentsObserver(web_contents) {}
   virtual ~MockWebContentsObserver() {}
 
   // A hook to verify that the OneClickSigninSyncObserver initiated a redirect
   // to the continue URL. Navigations in unit_tests never complete, but a
   // navigation start is a sufficient signal for the purposes of this test.
   // Listening for this call also has the advantage of being synchronous.
+  MOCK_METHOD1(DidStartNavigation, void(content::NavigationHandle*));
+  // TODO: remove this method when PlzNavigate is turned on by default.
   MOCK_METHOD2(DidStartNavigationToPendingEntry,
                void(const GURL&, content::ReloadType));
 };
 
 class OneClickTestProfileSyncService
     : public browser_sync::TestProfileSyncService {
  public:
   ~OneClickTestProfileSyncService() override {}
 
   // Helper routine to be used in conjunction with
@@ skipping 112 matching lines @@
 
 // Verify that if no Sync service is present, e.g. because Sync is disabled, the
 // observer immediately loads the continue URL.
 TEST_F(OneClickSigninSyncObserverTest, NoSyncService_RedirectsImmediately) {
   // Simulate disabling Sync.
   sync_service_ = static_cast<OneClickTestProfileSyncService*>(
       ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
           profile(), BuildNullService));
 
   // The observer should immediately redirect to the continue URL.
-  EXPECT_CALL(*web_contents_observer_, DidStartNavigationToPendingEntry(_, _));
+  if (content::IsBrowserSideNavigationEnabled()) {
+    EXPECT_CALL(*web_contents_observer_, DidStartNavigation(_));
+  } else {
+    EXPECT_CALL(*web_contents_observer_,
+                DidStartNavigationToPendingEntry(_, _));
+  }
   CreateSyncObserver(kContinueUrl);
   EXPECT_EQ(GURL(kContinueUrl), web_contents()->GetVisibleURL());
 
   // The |sync_observer_| will be destroyed asynchronously, so manually pump
   // the message loop to wait for the destruction.
   content::RunAllPendingInMessageLoop();
 }
 
 // Verify that when the WebContents is destroyed without any Sync notifications
 // firing, the observer cleans up its memory without loading the continue URL.
 TEST_F(OneClickSigninSyncObserverTest, WebContentsDestroyed) {
-  EXPECT_CALL(*web_contents_observer_,
-              DidStartNavigationToPendingEntry(_, _)).Times(0);
-  CreateSyncObserver(kContinueUrl);
-  SetContents(NULL);
+  if (content::IsBrowserSideNavigationEnabled()) {
+    EXPECT_CALL(*web_contents_observer_, DidStartNavigation(_)).Times(0);;
+    CreateSyncObserver(kContinueUrl);
+    SetContents(NULL);
+  } else {
+    EXPECT_CALL(*web_contents_observer_,
+                DidStartNavigationToPendingEntry(_, _)).Times(0);
+    CreateSyncObserver(kContinueUrl);
+    SetContents(NULL);
+  }
 }
 
 // Verify that when Sync is configured successfully, the observer loads the
 // continue URL and cleans up after itself.
 TEST_F(OneClickSigninSyncObserverTest,
        OnSyncStateChanged_SyncConfiguredSuccessfully) {
   CreateSyncObserver(kContinueUrl);
   sync_service_->set_first_setup_in_progress(false);
   sync_service_->set_sync_active(true);
 
-  EXPECT_CALL(*web_contents_observer_, DidStartNavigationToPendingEntry(_, _));
+  if (content::IsBrowserSideNavigationEnabled()) {
+    EXPECT_CALL(*web_contents_observer_, DidStartNavigation(_));
+  } else {
+    EXPECT_CALL(*web_contents_observer_,
+                DidStartNavigationToPendingEntry(_, _));
+  }
   sync_service_->NotifyObservers();
   EXPECT_EQ(GURL(kContinueUrl), web_contents()->GetVisibleURL());
 }
 
 // Verify that when Sync configuration fails, the observer does not load the
 // continue URL, but still cleans up after itself.
 TEST_F(OneClickSigninSyncObserverTest,
        OnSyncStateChanged_SyncConfigurationFailed) {
   CreateSyncObserver(kContinueUrl);
   sync_service_->set_first_setup_in_progress(false);
   sync_service_->set_sync_active(false);
 
-  EXPECT_CALL(*web_contents_observer_,
-              DidStartNavigationToPendingEntry(_, _)).Times(0);
-  sync_service_->NotifyObservers();
+  if (content::IsBrowserSideNavigationEnabled()) {
+    EXPECT_CALL(*web_contents_observer_, DidStartNavigation(_)).Times(0);
+    sync_service_->NotifyObservers();
+  } else {
+    EXPECT_CALL(*web_contents_observer_,
+                DidStartNavigationToPendingEntry(_, _)).Times(0);
+    sync_service_->NotifyObservers();
+  }
   EXPECT_NE(GURL(kContinueUrl), web_contents()->GetVisibleURL());
 }
 
 // Verify that when Sync sends a notification while setup is not yet complete,
 // the observer does not load the continue URL, and continues to wait.
 TEST_F(OneClickSigninSyncObserverTest,
        OnSyncStateChanged_SyncConfigurationInProgress) {
   CreateSyncObserver(kContinueUrl);
   sync_service_->set_first_setup_in_progress(true);
   sync_service_->set_sync_active(false);
 
-  EXPECT_CALL(*web_contents_observer_,
-              DidStartNavigationToPendingEntry(_, _)).Times(0);
-  sync_service_->NotifyObservers();
+  if (content::IsBrowserSideNavigationEnabled()) {
+    EXPECT_CALL(*web_contents_observer_, DidStartNavigation(_)).Times(0);;
+    sync_service_->NotifyObservers();
+  } else {
+    EXPECT_CALL(*web_contents_observer_,
+                DidStartNavigationToPendingEntry(_, _)).Times(0);;
+    sync_service_->NotifyObservers();
+  }
   EXPECT_NE(GURL(kContinueUrl), web_contents()->GetVisibleURL());
 
   // Trigger an event to force state to be cleaned up.
   SetContents(NULL);
 }
 
 // Verify that if the continue_url is to the settings page, no navigation is
 // triggered, since it would be redundant.
 TEST_F(OneClickSigninSyncObserverTest,
        OnSyncStateChanged_SyncConfiguredSuccessfully_SourceIsSettings) {
   GURL continue_url = signin::GetPromoURL(
       signin_metrics::AccessPoint::ACCESS_POINT_SETTINGS,
       signin_metrics::Reason::REASON_SIGNIN_PRIMARY_ACCOUNT, false);
   CreateSyncObserver(continue_url.spec());
   sync_service_->set_first_setup_in_progress(false);
   sync_service_->set_sync_active(true);
 
-  EXPECT_CALL(*web_contents_observer_,
-              DidStartNavigationToPendingEntry(_, _)).Times(0);
-  sync_service_->NotifyObservers();
+  if (content::IsBrowserSideNavigationEnabled()) {
+    EXPECT_CALL(*web_contents_observer_, DidStartNavigation(_)).Times(0);
+    sync_service_->NotifyObservers();
+  } else {
+    EXPECT_CALL(*web_contents_observer_,
+                DidStartNavigationToPendingEntry(_, _)).Times(0);
+    sync_service_->NotifyObservers();
+  }
   EXPECT_NE(GURL(kContinueUrl), web_contents()->GetVisibleURL());
 }