Retire ScopedObserver in /components/password_manager.

ScopedObserver is being deprecated in favor of two new classes:
- base::ScopedObservation for observers that only ever observe
  a single source.
- base::ScopedMultiSourceObservation for observers that do or may
  observe more than a single source.

This CL was uploaded by git cl split.

R=vasilii@chromium.org

Bug: 1145565
Change-Id: I12660e862e5b73ed06f39d1ca4eb40a8067a4760
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533022
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826378}

components/password_manager/core/browser/password_session_durations_metrics_recorder.cc

@@ -40,7 +40,7 @@ PasswordSessionDurationsMetricsRecorder::
   DCHECK(pref_service_);
   // |sync_service| can be null if sync is disabled by a command line flag.
   if (sync_service_)
-    sync_observer_.Add(sync_service_);
+    sync_observation_.Observe(sync_service_);
 }
 
 PasswordSessionDurationsMetricsRecorder::

components/password_manager/core/browser/password_session_durations_metrics_recorder.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "base/scoped_observer.h"
+#include "base/scoped_observation.h"
 #include "base/timer/elapsed_timer.h"
 #include "components/password_manager/core/browser/password_account_storage_settings_watcher.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
@@ -52,8 +52,8 @@ class PasswordSessionDurationsMetricsRecorder
 
   PasswordAccountStorageSettingsWatcher settings_watcher_;
 
-  ScopedObserver<syncer::SyncService, syncer::SyncServiceObserver>
-      sync_observer_{this};
+  base::ScopedObservation<syncer::SyncService, syncer::SyncServiceObserver>
+      sync_observation_{this};
 
   // Tracks the elapsed active session time while the browser is open. The timer
   // is null if there's no active session.

components/password_manager/core/browser/ui/compromised_credentials_reader.cc

@@ -16,9 +16,9 @@ CompromisedCredentialsReader::CompromisedCredentialsReader(
     PasswordStore* account_store)
     : profile_store_(profile_store), account_store_(account_store) {
   DCHECK(profile_store_);
-  observed_password_store_.Add(profile_store_);
+  observed_password_stores_.AddObservation(profile_store_);
   if (account_store_) {
-    observed_password_store_.Add(account_store_);
+    observed_password_stores_.AddObservation(account_store_);
   } else {
     // Since we aren't expecting any response from the account store, mark it as
     // responded not to block responses from the the profile waiting for the

components/password_manager/core/browser/ui/compromised_credentials_reader.h

@@ -6,7 +6,7 @@
 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_UI_COMPROMISED_CREDENTIALS_READER_H_
 
 #include "base/observer_list.h"
-#include "base/scoped_observer.h"
+#include "base/scoped_multi_source_observation.h"
 #include "components/password_manager/core/browser/compromised_credentials_consumer.h"
 #include "components/password_manager/core/browser/password_store.h"
 
@@ -68,11 +68,12 @@ class CompromisedCredentialsReader
 
   // A scoped observer for |profile_store_|, and |account_store_| that listens
   // to changes related to CompromisedCredentials only.
-  ScopedObserver<PasswordStore,
-                 PasswordStore::DatabaseCompromisedCredentialsObserver,
-                 &PasswordStore::AddDatabaseCompromisedCredentialsObserver,
-                 &PasswordStore::RemoveDatabaseCompromisedCredentialsObserver>
-      observed_password_store_{this};
+  base::ScopedMultiSourceObservation<
+      PasswordStore,
+      PasswordStore::DatabaseCompromisedCredentialsObserver,
+      &PasswordStore::AddDatabaseCompromisedCredentialsObserver,
+      &PasswordStore::RemoveDatabaseCompromisedCredentialsObserver>
+      observed_password_stores_{this};
 
   base::ObserverList<Observer, /*check_empty=*/true> observers_;
   std::vector<GetCompromisedCredentialsCallback>

components/password_manager/core/browser/ui/compromised_credentials_reader_unittest.cc

@@ -5,7 +5,7 @@
 #include "components/password_manager/core/browser/ui/compromised_credentials_reader.h"
 
 #include "base/memory/scoped_refptr.h"
-#include "base/scoped_observer.h"
+#include "base/scoped_observation.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/mock_callback.h"
 #include "base/test/task_environment.h"

components/password_manager/core/browser/ui/insecure_credentials_manager.cc

@@ -227,9 +227,9 @@ InsecureCredentialsManager::InsecureCredentialsManager(
       account_store_(std::move(account_store)),
       compromised_credentials_reader_(profile_store_.get(),
                                       account_store_.get()) {
-  observed_compromised_credentials_reader_.Add(
+  observed_compromised_credentials_reader_.Observe(
       &compromised_credentials_reader_);
-  observed_saved_password_presenter_.Add(presenter_);
+  observed_saved_password_presenter_.Observe(presenter_);
 }
 
 InsecureCredentialsManager::~InsecureCredentialsManager() = default;

components/password_manager/core/browser/ui/insecure_credentials_manager.h

@@ -13,7 +13,7 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/observer_list.h"
 #include "base/observer_list_types.h"
-#include "base/scoped_observer.h"
+#include "base/scoped_observation.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/util/type_safety/strong_alias.h"
 #include "components/password_manager/core/browser/compromised_credentials_consumer.h"
@@ -253,12 +253,13 @@ class InsecureCredentialsManager
 
   // A scoped observer for |compromised_credentials_reader_| to listen changes
   // related to CompromisedCredentials only.
-  ScopedObserver<CompromisedCredentialsReader,
-                 CompromisedCredentialsReader::Observer>
+  base::ScopedObservation<CompromisedCredentialsReader,
+                          CompromisedCredentialsReader::Observer>
       observed_compromised_credentials_reader_{this};
 
   // A scoped observer for |presenter_|.
-  ScopedObserver<SavedPasswordsPresenter, SavedPasswordsPresenter::Observer>
+  base::ScopedObservation<SavedPasswordsPresenter,
+                          SavedPasswordsPresenter::Observer>
       observed_saved_password_presenter_{this};
 
   base::ObserverList<Observer, /*check_empty=*/true> observers_;

components/password_manager/core/browser/ui/saved_passwords_presenter_unittest.cc

@@ -5,7 +5,7 @@
 #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
 
 #include "base/memory/scoped_refptr.h"
-#include "base/scoped_observer.h"
+#include "base/scoped_observation.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/task_environment.h"