Get AccountInfo struct right before it being used

account_info_ is initialized when ChromePasswordProtectionService is
created (browser startup time).So if user changed their signin state
afterward, CPPS cannot capture it. We should in fact get AccountInfo
struct from SigninManager whenever it is being used.

Bug: 772041
Change-Id: Idedbcc71c444d84446662d2b9ed595901ac25ae8
Reviewed-on: https://chromium-review.googlesource.com/702915
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506934}

chrome/browser/safe_browsing/chrome_password_protection_service.cc

@@ -122,7 +122,6 @@ ChromePasswordProtectionService::ChromePasswordProtectionService(
       password_manager::prefs::kSyncPasswordHash,
       base::Bind(&ChromePasswordProtectionService::OnGaiaPasswordChanged,
                  base::Unretained(this)));
-  InitializeAccountInfo();
 }
 
 ChromePasswordProtectionService::~ChromePasswordProtectionService() {
@@ -409,14 +408,14 @@ void ChromePasswordProtectionService::MaybeLogPasswordReuseDetectedEvent(
 
 PasswordProtectionService::SyncAccountType
 ChromePasswordProtectionService::GetSyncAccountType() {
-  if (!account_info_ || account_info_->account_id.empty() ||
-      account_info_->hosted_domain.empty()) {
+  const AccountInfo account_info = GetAccountInfo();
+  if (account_info.account_id.empty() || account_info.hosted_domain.empty()) {
     return LoginReputationClientRequest::PasswordReuseEvent::NOT_SIGNED_IN;
   }
 
   // For gmail or googlemail account, the hosted_domain will always be
   // kNoHostedDomainFound.
-  return account_info_->hosted_domain ==
+  return account_info.hosted_domain ==
                  std::string(AccountTrackerService::kNoHostedDomainFound)
              ? LoginReputationClientRequest::PasswordReuseEvent::GMAIL
              : LoginReputationClientRequest::PasswordReuseEvent::GSUITE;
@@ -599,19 +598,16 @@ bool ChromePasswordProtectionService::UserClickedThroughSBInterstitial(
          current_threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE;
 }
 
-void ChromePasswordProtectionService::InitializeAccountInfo() {
+AccountInfo ChromePasswordProtectionService::GetAccountInfo() {
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfileIfExists(profile_);
-
-  if (signin_manager) {
-    account_info_ = base::MakeUnique<AccountInfo>(
-        signin_manager->GetAuthenticatedAccountInfo());
-  }
+  DCHECK(signin_manager);
+  return signin_manager->GetAuthenticatedAccountInfo();
 }
 
 GURL ChromePasswordProtectionService::GetChangePasswordURL() {
-  DCHECK(!account_info_->email.empty());
-  std::string account_email = account_info_->email;
+  const AccountInfo account_info = GetAccountInfo();
+  std::string account_email = account_info.email;
   // This page will prompt for re-auth and then will prompt for a new password.
   std::string account_url =
       "https://myaccount.google.com/signinoptions/"
@@ -645,7 +641,6 @@ ChromePasswordProtectionService::ChromePasswordProtectionService(
       ui_manager_(ui_manager),
       trigger_manager_(nullptr),
       profile_(profile) {
-  InitializeAccountInfo();
 }
 
 }  // namespace safe_browsing

chrome/browser/safe_browsing/chrome_password_protection_service.h

@@ -157,8 +157,8 @@ class ChromePasswordProtectionService : public PasswordProtectionService {
   void UpdateSecurityState(SBThreatType threat_type,
                            content::WebContents* web_contents) override;
 
-  // Sets |account_info_| based on |profile_|.
-  void InitializeAccountInfo();
+  // Gets |account_info_| based on |profile_|.
+  AccountInfo GetAccountInfo();
 
   // Gets change password URl based on |account_info_|.
   GURL GetChangePasswordURL();
@@ -216,8 +216,6 @@ class ChromePasswordProtectionService : public PasswordProtectionService {
   TriggerManager* trigger_manager_;
   // Profile associated with this instance.
   Profile* profile_;
-  // AccountInfo associated with this |profile_|.
-  std::unique_ptr<AccountInfo> account_info_;
   scoped_refptr<SafeBrowsingNavigationObserverManager>
       navigation_observer_manager_;
   base::ObserverList<Observer> observer_list_;

chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc

@@ -80,10 +80,6 @@ class ChromePasswordProtectionServiceBrowserTest : public InProcessBrowserTest {
     helper->GetSecurityInfo(out_security_info);
   }
 
-  void SetDefaultProfileEmail(ChromePasswordProtectionService* service) {
-    service->account_info_->email = "foo@bar.com";
-  }
-
  protected:
   base::test::ScopedFeatureList scoped_feature_list_;
   base::HistogramTester histograms_;
@@ -92,7 +88,6 @@ class ChromePasswordProtectionServiceBrowserTest : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(ChromePasswordProtectionServiceBrowserTest,
                        SuccessfullyChangePassword) {
   ChromePasswordProtectionService* service = GetService(/*is_incognito=*/false);
-  SetDefaultProfileEmail(service);
   Profile* profile = browser()->profile();
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();

chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc

@@ -241,13 +241,11 @@ TEST_F(ChromePasswordProtectionServiceTest, VerifyGetSyncAccountType) {
   signin_manager->SetAuthenticatedAccountInfo(kTestAccountID, kTestEmail);
   SetUpSyncAccount(std::string(AccountTrackerService::kNoHostedDomainFound),
                    std::string(kTestAccountID), std::string(kTestEmail));
-  service_->InitializeAccountInfo();
   EXPECT_EQ(LoginReputationClientRequest::PasswordReuseEvent::GMAIL,
             service_->GetSyncAccountType());
 
   SetUpSyncAccount("example.edu", std::string(kTestAccountID),
                    std::string(kTestEmail));
-  service_->InitializeAccountInfo();
   EXPECT_EQ(LoginReputationClientRequest::PasswordReuseEvent::GSUITE,
             service_->GetSyncAccountType());
 }
@@ -427,7 +425,6 @@ TEST_F(ChromePasswordProtectionServiceTest, VerifyGetChangePasswordURL) {
   signin_manager->SetAuthenticatedAccountInfo(kTestAccountID, kTestEmail);
   SetUpSyncAccount("example.com", std::string(kTestAccountID),
                    std::string(kTestEmail));
-  service_->InitializeAccountInfo();
   EXPECT_EQ(GURL("https://accounts.google.com/"
                  "AccountChooser?Email=foo%40example.com&continue=https%3A%2F%"
                  "2Fmyaccount.google.com%2Fsigninoptions%2Fpassword%3Futm_"