Link PasswordProtectionService to Profile and SB Service

chrome/browser/password_manager/chrome_password_manager_client.cc

Index: chrome/browser/password_manager/chrome_password_manager_client.cc
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index 7e02fbb29d88f53daa2f061c6b598e9c71df784a..348478386581fd02ea0ec685e2d23760778493d9 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -201,14 +201,6 @@ ChromePasswordManagerClient::ChromePasswordManagerClient(
   ReportMetrics(*saving_and_filling_passwords_enabled_, this, profile_);
   driver_factory_->RequestSendLoggingAvailability();
 
-#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
-  if (CanSetPasswordProtectionService()) {
-    password_reuse_detection_manager_.SetPasswordProtectionService(
-        g_browser_process->safe_browsing_service()
-            ->password_protection_service()
-            ->GetWeakPtr());
-  }
-#endif
 }
 
 ChromePasswordManagerClient::~ChromePasswordManagerClient() {}
@@ -427,6 +419,17 @@ void ChromePasswordManagerClient::HidePasswordGenerationPopup() {
     popup_controller_->HideAndDestroy();
 }
 
+#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+safe_browsing::PasswordProtectionService*
+ChromePasswordManagerClient::GetPasswordProtectionService() const {
+  if (g_browser_process && g_browser_process->safe_browsing_service()) {
+    return g_browser_process->safe_browsing_service()
+        ->GetPasswordProtectionService(profile_);
+  }
+  return nullptr;
+}
+#endif
+
 void ChromePasswordManagerClient::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
@@ -647,14 +650,6 @@ bool ChromePasswordManagerClient::ShouldAnnotateNavigationEntries(
   return true;
 }
 
-#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
-bool ChromePasswordManagerClient::CanSetPasswordProtectionService() {
-  return g_browser_process && g_browser_process->safe_browsing_service() &&
-         g_browser_process->safe_browsing_service()
-             ->password_protection_service();
-}
-#endif
-
 void ChromePasswordManagerClient::AnnotateNavigationEntry(
     bool has_password_field) {
   if (!ShouldAnnotateNavigationEntries(profile_))