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..251fc50d14684038310f84fdc4dec4afcf75bdb2 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -205,7 +205,7 @@ ChromePasswordManagerClient::ChromePasswordManagerClient(
   if (CanSetPasswordProtectionService()) {
     password_reuse_detection_manager_.SetPasswordProtectionService(
         g_browser_process->safe_browsing_service()
-            ->password_protection_service()
+            ->GetPasswordProtectionService(profile_)
             ->GetWeakPtr());
   }
 #endif
@@ -651,7 +651,7 @@ bool ChromePasswordManagerClient::ShouldAnnotateNavigationEntries(
 bool ChromePasswordManagerClient::CanSetPasswordProtectionService() {
   return g_browser_process && g_browser_process->safe_browsing_service() &&
          g_browser_process->safe_browsing_service()
-             ->password_protection_service();
+             ->GetPasswordProtectionService(profile_);

[Nathan Parker, 2017/03/30 21:38:12]

When would this be null but safe_browsing_service() not be null? Could we
simplify it by ensuring this was always not null? Then I think you could drop
the CanSetPasswordProtectionService() func.

[Jialiu Lin, 2017/03/30 23:23:04]

Agree. As long as SafeBrowsingService is not null, there should always be a
passwordProtectionService instance associated with this profile.
Removing this function.

 }
 #endif