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 187 matching lines @@
 
   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()
+            ->GetPasswordProtectionService(profile_)
             ->GetWeakPtr());
   }
 #endif
 }
 
 ChromePasswordManagerClient::~ChromePasswordManagerClient() {}
 
 bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage()
     const {
   DCHECK(web_contents());
@@ skipping 425 matching lines @@
     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();
+             ->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
 
 void ChromePasswordManagerClient::AnnotateNavigationEntry(
     bool has_password_field) {
   if (!ShouldAnnotateNavigationEntries(profile_))
     return;
 
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
@@ skipping 45 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);
 }