summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGarrett Casto <gcasto@chromium.org>2014-09-30 19:38:39 -0700
committerGarrett Casto <gcasto@chromium.org>2014-10-01 02:39:07 +0000
commit8f5d10ae734f1713e7b296b876f13650c7e80a99 (patch)
tree609bee3fe519c76bc0d3948f6f215680e2f906ca
parent193691c7ae3335575fdbfcd32660aacab73e16cc (diff)
downloadchromium_src-8f5d10ae734f1713e7b296b876f13650c7e80a99.zip
chromium_src-8f5d10ae734f1713e7b296b876f13650c7e80a99.tar.gz
chromium_src-8f5d10ae734f1713e7b296b876f13650c7e80a99.tar.bz2
Merge into branch 2125 [Password Generation] Fix a bug where we always upload ACCOUNT_CREATION_PASSWORD
Update test to catch the problem. Previous test mocked out bad behavior. BUG=419228 R=isherman@chromium.org Review URL: https://codereview.chromium.org/614313002 Cr-Commit-Position: refs/heads/master@{#297580} (cherry picked from commit 44c5e4ebc358b6e804ae7af97fd240ca5682743f) Review URL: https://codereview.chromium.org/619813002 Cr-Commit-Position: refs/branch-heads/2125@{#546} Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
-rw-r--r--components/password_manager/core/browser/password_form_manager.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
index dfe94a3..cd3d2a2 100644
--- a/components/password_manager/core/browser/password_form_manager.cc
+++ b/components/password_manager/core/browser/password_form_manager.cc
@@ -724,8 +724,7 @@ void PasswordFormManager::UploadPasswordForm(
// Note that this doesn't guarantee that the upload succeeded, only that
// |form_data| is considered uploadable.
bool success =
- autofill_manager->UploadPasswordForm(
- form_data, autofill::ACCOUNT_CREATION_PASSWORD);
+ autofill_manager->UploadPasswordForm(form_data, password_type);
UMA_HISTOGRAM_BOOLEAN("PasswordGeneration.UploadStarted", success);
}