Link PasswordProtectionService to Profile and SB Service

chrome/browser/password_manager/chrome_password_manager_client.h

Index: chrome/browser/password_manager/chrome_password_manager_client.h
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
index ab47052c96be95722605304c13d729aa32eed287..adcf1cd4aa9fefb71a5acfd86657ff27f8295dd7 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -104,6 +104,11 @@ class ChromePasswordManagerClient
   void GenerationAvailableForForm(const autofill::PasswordForm& form) override;
   void HidePasswordGenerationPopup() override;
 
+#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+  safe_browsing::PasswordProtectionService* GetPasswordProtectionService()

[Nathan Parker, 2017/04/03 20:33:34]

Re: SAFE_BROWSING_DB_REMOTE -- On Android we don't yet have the CSD Whitelist
(tracked in http://b/36806770), and it'll fail on a NOTREACHED() if you call
MatchCsdWhitelistUrl().  So we should keep this all disabled on
SAFE_BROWSING_DB_REMOTE until then.  You could do that here, or keep it here and
disable it someplace further down.

[Jialiu Lin, 2017/04/03 20:45:12]

Thanks for pointing this out. It completely slipped my mind. I'll make sure it
is gated in password_reuse_detection_manager.cc (where the actual calling
happens).

+      const override;
+#endif
+
   static void CreateForWebContentsWithAutofillClient(
       content::WebContents* contents,
       autofill::AutofillClient* autofill_client);
@@ -161,12 +166,6 @@ class ChromePasswordManagerClient
   // without custom sync passphrase.
   static bool ShouldAnnotateNavigationEntries(Profile* profile);
 
-#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
-  // Return true if we can set PasswordProtectionService in
-  // |password_reuse_detection_manager_|.
-  static bool CanSetPasswordProtectionService();
-#endif
-
   Profile* const profile_;
 
   password_manager::PasswordManager password_manager_;