Modify the update path in PasswordSyncableService::ProcessSyncChanges.

components/password_manager/core/browser/password_syncable_service_unittest.cc

Index: components/password_manager/core/browser/password_syncable_service_unittest.cc
diff --git a/components/password_manager/core/browser/password_syncable_service_unittest.cc b/components/password_manager/core/browser/password_syncable_service_unittest.cc
index b5ac4df9d4d414dd6993ac4d0cd3a7c50d4b74ec..2c724334115b49d896e37da27cbe1cf5d5f1fddb 100644
--- a/components/password_manager/core/browser/password_syncable_service_unittest.cc
+++ b/components/password_manager/core/browser/password_syncable_service_unittest.cc
@@ -449,22 +449,25 @@ TEST_F(PasswordSyncableServiceTest, Merge) {
   form1->signon_realm = "abc";
   form1->action = GURL("http://pie.com");
   form1->date_created = base::Time::Now();
+  form1->preferred = true;
   std::vector<autofill::PasswordForm*> forms;
   forms.push_back(form1.release());
   SetPasswordStoreData(forms, std::vector<autofill::PasswordForm*>());
 
+  autofill::PasswordForm form2(*forms[0]);
+  form2.preferred = false;
   verifier()->SetExpectedDBChanges(SyncDataList(),
-                                   std::vector<autofill::PasswordForm*>(),
+                                   std::vector<autofill::PasswordForm*>(1,
+                                                                        &form2),
                                    std::vector<autofill::PasswordForm*>(),
                                    password_store());
-  verifier()->SetExpectedSyncChanges(
-      SyncChangeList(1, CreateSyncChange(*forms[0],
-                                         SyncChange::ACTION_UPDATE)));
+  verifier()->SetExpectedSyncChanges(SyncChangeList());
 
   EXPECT_CALL(*service(), NotifyPasswordStoreOfLoginChanges(_));
 
   service()->MergeDataAndStartSyncing(syncer::PASSWORDS,
-                                      SyncDataList(1, CreateSyncData("abc")),
+                                      SyncDataList(1,
+                                                   SyncDataFromPassword(form2)),
                                       CreateSyncChangeProcessor(),
                                       scoped_ptr<syncer::SyncErrorFactory>());
 }
@@ -509,23 +512,18 @@ TEST_F(PasswordSyncableServiceTest, PasswordStoreChanges) {
 
 // Process all types of changes from sync.
 TEST_F(PasswordSyncableServiceTest, ProcessSyncChanges) {
-  scoped_ptr<autofill::PasswordForm> form1(new autofill::PasswordForm);
-  form1->signon_realm = "abc";
-  form1->action = GURL("http://foo.com");
-  scoped_ptr<autofill::PasswordForm> form2(new autofill::PasswordForm);
-  form2->signon_realm = "xyz";
-  form2->action = GURL("http://bar.com");
-  form2->date_created = base::Time::Now();
-  form2->blacklisted_by_user = true;
-  std::vector<autofill::PasswordForm*> forms(1, form1.release());
-  std::vector<autofill::PasswordForm*> blacklist_forms(1, form2.release());
-  SetPasswordStoreData(forms, blacklist_forms);
+  autofill::PasswordForm updated_form;
+  updated_form.signon_realm = "abc";
+  updated_form.action = GURL("http://foo.com");
+  updated_form.date_created = base::Time::Now();
+  autofill::PasswordForm deleted_form;
+  deleted_form.signon_realm = "xyz";
+  deleted_form.action = GURL("http://bar.com");
+  deleted_form.blacklisted_by_user = true;
 
   SyncData add_data = CreateSyncData("def");
-  autofill::PasswordForm updated_form = *forms[0];
-  updated_form.date_created = base::Time::Now();
   std::vector<autofill::PasswordForm*> updated_passwords(1, &updated_form);
-  std::vector<autofill::PasswordForm*> deleted_passwords(1, blacklist_forms[0]);
+  std::vector<autofill::PasswordForm*> deleted_passwords(1, &deleted_form);
   verifier()->SetExpectedDBChanges(SyncDataList(1, add_data),
                                    updated_passwords,
                                    deleted_passwords,
@@ -535,10 +533,9 @@ TEST_F(PasswordSyncableServiceTest, ProcessSyncChanges) {
   list.push_back(SyncChange(FROM_HERE,
                             syncer::SyncChange::ACTION_ADD,
                             add_data));
-  list.push_back(SyncChange(FROM_HERE,
-                            syncer::SyncChange::ACTION_UPDATE,
-                            SyncDataFromPassword(updated_form)));
-  list.push_back(CreateSyncChange(*blacklist_forms[0],
+  list.push_back(CreateSyncChange(updated_form,
+                                  syncer::SyncChange::ACTION_UPDATE));
+  list.push_back(CreateSyncChange(deleted_form,
                                   syncer::SyncChange::ACTION_DELETE));
   EXPECT_CALL(*service(), NotifyPasswordStoreOfLoginChanges(_));
   service()->ProcessSyncChanges(FROM_HERE, list);