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

components/password_manager/core/browser/password_form_manager_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
@@ skipping 669 matching lines @@
   // We expect to see this form eventually sent to the Password store. It
   // has password/username values from the store and 'username_element',
   // 'password_element', 'submit_element' and 'action' fields copied from
   // the encountered form.
   PasswordForm complete_form(*incomplete_form);
   complete_form.action = encountered_form.action;
   complete_form.password_element = encountered_form.password_element;
   complete_form.username_element = encountered_form.username_element;
   complete_form.submit_element = encountered_form.submit_element;
 
+  PasswordForm obsolete_form(*incomplete_form);
+  obsolete_form.action = encountered_form.action;
+
   // Feed the incomplete credentials to the manager.
   std::vector<PasswordForm*> results;
   results.push_back(incomplete_form);  // Takes ownership.
   form_manager.OnRequestDone(results);
 
   form_manager.ProvisionallySave(
       complete_form, PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
   // By now that form has been used once.
   complete_form.times_used = 1;
+  obsolete_form.times_used = 1;
 
   // Check that PasswordStore receives an update request with the complete form.
-  EXPECT_CALL(*mock_store(), UpdateLogin(complete_form));
+  EXPECT_CALL(*mock_store(), RemoveLogin(obsolete_form));
+  EXPECT_CALL(*mock_store(), AddLogin(complete_form));
   form_manager.Save();
 }
 
 TEST_F(PasswordFormManagerTest, TestScoringPublicSuffixMatch) {
   base::MessageLoop message_loop;
 
   TestPasswordManagerClient client(NULL);
   MockPasswordManagerDriver driver;
   EXPECT_CALL(driver, IsOffTheRecord()).WillRepeatedly(Return(false));
   EXPECT_CALL(driver, AllowPasswordGenerationForForm(_));
@@ skipping 14 matching lines @@
   results[1]->origin = GURL("http://accounts.google.com/a/ServiceLoginAuth2");
   results[1]->action = GURL("http://accounts.google.com/a/ServiceLogin2");
   SimulateFetchMatchingLoginsFromPasswordStore(manager.get());
   SimulateResponseFromPasswordStore(manager.get(), results);
   EXPECT_EQ(1u, password_manager.GetLatestBestMatches().size());
   EXPECT_EQ("", password_manager.GetLatestBestMatches().begin()
       ->second->original_signon_realm);
 }
 
 }  // namespace password_manager