Commit f3c3d962 authored by Mohamed Amir Yosef's avatar Mohamed Amir Yosef Committed by Commit Bot

[Passwords] Rename IsAccountStoreEnabled to IsOptedInForAccountStorage

This is a mechanical change that only renames a method in the
MultiStorePasswordSaveManager for clarity.

Bug: 1012203
Change-Id: Ic46aa9ad60b753385f23769f26f2d589135fc762
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2129539
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Auto-Submit: Mohamed Amir Yosef <mamir@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754995}
parent f46171eb
...@@ -118,7 +118,7 @@ void MultiStorePasswordSaveManager::SaveInternal( ...@@ -118,7 +118,7 @@ void MultiStorePasswordSaveManager::SaveInternal(
switch (pending_credentials_.in_store) { switch (pending_credentials_.in_store) {
case PasswordForm::Store::kAccountStore: case PasswordForm::Store::kAccountStore:
if (account_store_form_saver_ && IsAccountStoreEnabled()) { if (account_store_form_saver_ && IsOptedInForAccountStorage()) {
account_store_form_saver_->Save( account_store_form_saver_->Save(
pending_credentials_, AccountStoreMatches(matches), old_password); pending_credentials_, AccountStoreMatches(matches), old_password);
} }
...@@ -143,7 +143,7 @@ void MultiStorePasswordSaveManager::UpdateInternal( ...@@ -143,7 +143,7 @@ void MultiStorePasswordSaveManager::UpdateInternal(
// update operation is no-op. // update operation is no-op.
form_saver_->Update(pending_credentials_, ProfileStoreMatches(matches), form_saver_->Update(pending_credentials_, ProfileStoreMatches(matches),
old_password); old_password);
if (account_store_form_saver_ && IsAccountStoreEnabled()) { if (account_store_form_saver_ && IsOptedInForAccountStorage()) {
account_store_form_saver_->Update( account_store_form_saver_->Update(
pending_credentials_, AccountStoreMatches(matches), old_password); pending_credentials_, AccountStoreMatches(matches), old_password);
} }
...@@ -152,7 +152,7 @@ void MultiStorePasswordSaveManager::UpdateInternal( ...@@ -152,7 +152,7 @@ void MultiStorePasswordSaveManager::UpdateInternal(
void MultiStorePasswordSaveManager::PermanentlyBlacklist( void MultiStorePasswordSaveManager::PermanentlyBlacklist(
const PasswordStore::FormDigest& form_digest) { const PasswordStore::FormDigest& form_digest) {
DCHECK(!client_->IsIncognito()); DCHECK(!client_->IsIncognito());
if (account_store_form_saver_ && IsAccountStoreEnabled() && if (account_store_form_saver_ && IsOptedInForAccountStorage() &&
client_->GetPasswordFeatureManager()->GetDefaultPasswordStore() == client_->GetPasswordFeatureManager()->GetDefaultPasswordStore() ==
PasswordForm::Store::kAccountStore) { PasswordForm::Store::kAccountStore) {
account_store_form_saver_->PermanentlyBlacklist(form_digest); account_store_form_saver_->PermanentlyBlacklist(form_digest);
...@@ -168,7 +168,7 @@ void MultiStorePasswordSaveManager::Unblacklist( ...@@ -168,7 +168,7 @@ void MultiStorePasswordSaveManager::Unblacklist(
// Try to unblacklist in both stores anyway because if credentials don't // Try to unblacklist in both stores anyway because if credentials don't
// exist, the unblacklist operation is no-op. // exist, the unblacklist operation is no-op.
form_saver_->Unblacklist(form_digest); form_saver_->Unblacklist(form_digest);
if (account_store_form_saver_ && IsAccountStoreEnabled()) { if (account_store_form_saver_ && IsOptedInForAccountStorage()) {
account_store_form_saver_->Unblacklist(form_digest); account_store_form_saver_->Unblacklist(form_digest);
} }
} }
...@@ -256,12 +256,12 @@ MultiStorePasswordSaveManager::FindSimilarSavedFormAndComputeState( ...@@ -256,12 +256,12 @@ MultiStorePasswordSaveManager::FindSimilarSavedFormAndComputeState(
} }
FormSaver* MultiStorePasswordSaveManager::GetFormSaverForGeneration() { FormSaver* MultiStorePasswordSaveManager::GetFormSaverForGeneration() {
return IsAccountStoreEnabled() && account_store_form_saver_ return IsOptedInForAccountStorage() && account_store_form_saver_
? account_store_form_saver_.get() ? account_store_form_saver_.get()
: form_saver_.get(); : form_saver_.get();
} }
bool MultiStorePasswordSaveManager::IsAccountStoreEnabled() { bool MultiStorePasswordSaveManager::IsOptedInForAccountStorage() {
return client_->GetPasswordFeatureManager()->IsOptedInForAccountStorage(); return client_->GetPasswordFeatureManager()->IsOptedInForAccountStorage();
} }
......
...@@ -48,7 +48,7 @@ class MultiStorePasswordSaveManager : public PasswordSaveManagerImpl { ...@@ -48,7 +48,7 @@ class MultiStorePasswordSaveManager : public PasswordSaveManagerImpl {
FormSaver* GetFormSaverForGeneration() override; FormSaver* GetFormSaverForGeneration() override;
private: private:
bool IsAccountStoreEnabled(); bool IsOptedInForAccountStorage();
const std::unique_ptr<FormSaver> account_store_form_saver_; const std::unique_ptr<FormSaver> account_store_form_saver_;
DISALLOW_COPY_AND_ASSIGN(MultiStorePasswordSaveManager); DISALLOW_COPY_AND_ASSIGN(MultiStorePasswordSaveManager);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment