Password Login Database: report correct changes from UpdateLogin().

components/password_manager/core/browser/password_form_manager.cc

 // Copyright (c) 2012 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 "components/password_manager/core/browser/password_form_manager.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_split.h"
@@ skipping 252 matching lines @@
     pending_credentials_.other_possible_usernames =
         credentials.other_possible_usernames;
   }
 
   pending_credentials_.action = credentials.action;
   // If the user selected credentials we autofilled from a PasswordForm
   // that contained no action URL (IE6/7 imported passwords, for example),
   // bless it with the action URL from the observed form. See bug 1107719.
   if (pending_credentials_.action.is_empty())
     pending_credentials_.action = observed_form_.action;
-  // Similarly, bless incomplete credentials with *_element info.
-  if (pending_credentials_.password_element.empty())
-    pending_credentials_.password_element = observed_form_.password_element;
-  if (pending_credentials_.username_element.empty())
-    pending_credentials_.username_element = observed_form_.username_element;
-  if (pending_credentials_.submit_element.empty())
-    pending_credentials_.submit_element = observed_form_.submit_element;
 
   pending_credentials_.password_value = credentials.password_value;
   pending_credentials_.preferred = credentials.preferred;
 
   if (user_action_ == kUserActionOverridePassword &&
       pending_credentials_.type == PasswordForm::TYPE_GENERATED &&
       !has_generated_password_) {
     LogPasswordGenerationSubmissionEvent(PASSWORD_OVERRIDDEN);
   }
 
@@ skipping 284 matching lines @@
     // has a different preference on each site. For example, on /a, he wants the
     // general empty-path login so it is flagged as preferred, but on /b he logs
     // in with a different saved entry - we don't want to remove the preferred
     // status of the former because upon return to /a it won't be the default-
     // fill match.
     // TODO(timsteele): Bug 1188626 - expire the master copies.
     PasswordForm copy(pending_credentials_);
     copy.origin = observed_form_.origin;
     copy.action = observed_form_.action;
     password_store->AddLogin(copy);
+  } else if (pending_credentials_.password_element.empty() ||
+             pending_credentials_.username_element.empty() ||
+             pending_credentials_.submit_element.empty()) {
+    // password_element and username_element can't be updated because they are
+    // part of Sync and PasswordStore primary key. Thus, we must delete the old
+    // one and add again.
+    password_store->RemoveLogin(pending_credentials_);
+    pending_credentials_.password_element = observed_form_.password_element;
+    pending_credentials_.username_element = observed_form_.username_element;
+    pending_credentials_.submit_element = observed_form_.submit_element;
+    password_store->AddLogin(pending_credentials_);
   } else {
     password_store->UpdateLogin(pending_credentials_);
   }
 }
 
 bool PasswordFormManager::UpdatePendingCredentialsIfOtherPossibleUsername(
     const base::string16& username) {
   for (PasswordFormMap::const_iterator it = best_matches_.begin();
        it != best_matches_.end(); ++it) {
     for (size_t i = 0; i < it->second->other_possible_usernames.size(); ++i) {
@@ skipping 96 matching lines @@
     LogPasswordGenerationSubmissionEvent(PASSWORD_SUBMITTED);
 }
 
 void PasswordFormManager::SubmitFailed() {
   submit_result_ = kSubmitResultFailed;
   if (has_generated_password_)
     LogPasswordGenerationSubmissionEvent(PASSWORD_SUBMISSION_FAILED);
 }
 
 }  // namespace password_manager