[Passwords] Introduce PasswordManagerClient.GetAccountPasswordStore()

The new API will be used by password manager code within the effort of
Butter4Passwords

TBR=vasilii@chromium.org

Change-Id: I1b0bc300fce37e3695f579aaabbbc7c5bfba4796
Bug: 1002000
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1795323
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695609}

chrome/browser/password_manager/chrome_password_manager_client.cc

@@ -20,6 +20,7 @@
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
+#include "chrome/browser/password_manager/account_storage/account_password_store_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/password_manager/touch_to_fill_controller.h"
 #include "chrome/browser/prerender/prerender_contents.h"
@@ -682,12 +683,19 @@ password_manager::PasswordStore*
 ChromePasswordManagerClient::GetProfilePasswordStore() const {
   // Always use EXPLICIT_ACCESS as the password manager checks IsIncognito
   // itself when it shouldn't access the PasswordStore.
-  // TODO(gcasto): Is is safe to change this to
-  // ServiceAccessType::IMPLICIT_ACCESS?
   return PasswordStoreFactory::GetForProfile(
              profile_, ServiceAccessType::EXPLICIT_ACCESS).get();
 }
 
+password_manager::PasswordStore*
+ChromePasswordManagerClient::GetAccountPasswordStore() const {
+  // Always use EXPLICIT_ACCESS as the password manager checks IsIncognito
+  // itself when it shouldn't access the PasswordStore.
+  return AccountPasswordStoreFactory::GetForProfile(
+             profile_, ServiceAccessType::EXPLICIT_ACCESS)
+      .get();
+}
+
 password_manager::SyncState ChromePasswordManagerClient::GetPasswordSyncState()
     const {
   const syncer::SyncService* sync_service =

chrome/browser/password_manager/chrome_password_manager_client.h

@@ -125,6 +125,7 @@ class ChromePasswordManagerClient
 
   PrefService* GetPrefs() const override;
   password_manager::PasswordStore* GetProfilePasswordStore() const override;
+  password_manager::PasswordStore* GetAccountPasswordStore() const override;
   password_manager::SyncState GetPasswordSyncState() const override;
   bool WasLastNavigationHTTPError() const override;
   net::CertStatus GetMainFrameCertStatus() const override;

components/password_manager/core/browser/password_manager_client.h

@@ -227,6 +227,9 @@ class PasswordManagerClient {
   // Returns the profile PasswordStore associated with this instance.
   virtual PasswordStore* GetProfilePasswordStore() const = 0;
 
+  // Returns the account PasswordStore associated with this instance.
+  virtual PasswordStore* GetAccountPasswordStore() const = 0;
+
   // Reports whether and how passwords are synced in the embedder. The default
   // implementation always returns NOT_SYNCING.
   virtual SyncState GetPasswordSyncState() const;

components/password_manager/core/browser/stub_password_manager_client.cc

@@ -69,6 +69,10 @@ PasswordStore* StubPasswordManagerClient::GetProfilePasswordStore() const {
   return nullptr;
 }
 
+PasswordStore* StubPasswordManagerClient::GetAccountPasswordStore() const {
+  return nullptr;
+}
+
 const GURL& StubPasswordManagerClient::GetLastCommittedEntryURL() const {
   return GURL::EmptyGURL();
 }

components/password_manager/core/browser/stub_password_manager_client.h

@@ -55,6 +55,7 @@ class StubPasswordManagerClient : public PasswordManagerClient {
       std::unique_ptr<PasswordFormManagerForUI> saved_manager) override;
   PrefService* GetPrefs() const override;
   PasswordStore* GetProfilePasswordStore() const override;
+  PasswordStore* GetAccountPasswordStore() const override;
   const GURL& GetLastCommittedEntryURL() const override;
   const CredentialsFilter* GetStoreResultFilter() const override;
   const autofill::LogManager* GetLogManager() const override;

ios/chrome/browser/passwords/ios_chrome_password_manager_client.h

@@ -100,6 +100,7 @@ class IOSChromePasswordManagerClient
   bool IsMainFrameSecure() const override;
   PrefService* GetPrefs() const override;
   password_manager::PasswordStore* GetProfilePasswordStore() const override;
+  password_manager::PasswordStore* GetAccountPasswordStore() const override;
   void NotifyUserAutoSignin(
       std::vector<std::unique_ptr<autofill::PasswordForm>> local_forms,
       const GURL& origin) override;

ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm

@@ -161,6 +161,11 @@ PasswordStore* IOSChromePasswordManagerClient::GetProfilePasswordStore() const {
       .get();
 }
 
+PasswordStore* IOSChromePasswordManagerClient::GetAccountPasswordStore() const {
+  // AccountPasswordStore is currenly not supported on iOS.
+  return nullptr;
+}
+
 void IOSChromePasswordManagerClient::NotifyUserAutoSignin(
     std::vector<std::unique_ptr<autofill::PasswordForm>> local_forms,
     const GURL& origin) {

ios/web_view/internal/passwords/web_view_password_manager_client.h

@@ -88,6 +88,7 @@ class WebViewPasswordManagerClient
       const override;
   PrefService* GetPrefs() const override;
   password_manager::PasswordStore* GetProfilePasswordStore() const override;
+  password_manager::PasswordStore* GetAccountPasswordStore() const override;
   void NotifyUserAutoSignin(
       std::vector<std::unique_ptr<autofill::PasswordForm>> local_forms,
       const GURL& origin) override;

ios/web_view/internal/passwords/web_view_password_manager_client.mm

@@ -133,6 +133,11 @@ PasswordStore* WebViewPasswordManagerClient::GetProfilePasswordStore() const {
       .get();
 }
 
+PasswordStore* WebViewPasswordManagerClient::GetAccountPasswordStore() const {
+  // Account password stores aren't currently supported in iOS webviews.
+  return nullptr;
+}
+
 void WebViewPasswordManagerClient::NotifyUserAutoSignin(
     std::vector<std::unique_ptr<autofill::PasswordForm>> local_forms,
     const GURL& origin) {