Link PasswordProtectionService to Profile and SB Service

chrome/browser/password_manager/chrome_password_manager_client.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/password_manager/chrome_password_manager_client.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 183 matching lines @@
           GetForBrowserContext(profile_),
       base::Bind(
           &ContentPasswordManagerDriverFactory::RequestSendLoggingAvailability,
           base::Unretained(driver_factory_)));
 
   saving_and_filling_passwords_enabled_.Init(
       password_manager::prefs::kCredentialsEnableService, GetPrefs());
   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() {}
 
 bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage()
     const {
   DCHECK(web_contents());
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   bool is_enabled = false;
@@ skipping 198 matching lines @@
   manage_passwords_ui_controller->OnPasswordAutofilled(best_matches, origin,
                                                        federated_matches);
 #endif
 }
 
 void ChromePasswordManagerClient::HidePasswordGenerationPopup() {
   if (popup_controller_)
     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())
     return;
 
   password_reuse_detection_manager_.DidNavigateMainFrame(GetMainFrameURL());
   // After some navigations RenderViewHost persists and just adding the observer
   // will cause multiple call of OnInputEvent. Since Widget API doesn't allow to
   // check whether the observer is already added, the observer is removed and
   // added again, to ensure that it is added only once.
@@ skipping 200 matching lines @@
   browser_sync::ProfileSyncService* profile_sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   if (!profile_sync_service || !profile_sync_service->IsSyncActive() ||
       profile_sync_service->IsUsingSecondaryPassphrase()) {
     return false;
   }
 
   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_))
     return;
 
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   if (!entry)
     return;
 
@@ skipping 42 matching lines @@
 // static
 bool ChromePasswordManagerClient::CanShowBubbleOnURL(const GURL& url) {
   std::string scheme = url.scheme();
   return (content::ChildProcessSecurityPolicy::GetInstance()->IsWebSafeScheme(
               scheme) &&
 #if BUILDFLAG(ENABLE_EXTENSIONS)
           scheme != extensions::kExtensionScheme &&
 #endif
           scheme != content::kChromeDevToolsScheme);
 }