Use the max use count on autofill profile merge.

components/browser_sync/browser/profile_sync_service_autofill_unittest.cc

 // Copyright 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 1011 matching lines @@
   AutofillProfile* native_profile = new AutofillProfile;
   autofill::test::SetProfileInfoWithGuid(
       native_profile, "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "", "123 Zoo St.", "unit 5",
       "Hollywood", "CA", "91601", "US", "12345678910");
   native_profile->set_use_date(base::Time::FromTimeT(1234));
 
   AutofillProfile expected_profile(sync_profile);
   expected_profile.SetRawInfo(NAME_FULL,
                               ASCIIToUTF16("Billing Mitchell Morrison"));
-  expected_profile.set_use_count(2);
+  expected_profile.set_use_count(1);
 
   std::vector<AutofillProfile*> native_profiles;
   native_profiles.push_back(native_profile);
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
   EXPECT_CALL(autofill_table(),
               AddAutofillProfile(MatchProfiles(expected_profile)))
       .WillOnce(Return(true));
   EXPECT_CALL(autofill_table(),
               RemoveAutofillProfile("23355099-1170-4B71-8ED4-144470CC9EBF"))
@@ skipping 12 matching lines @@
       GetAutofillProfilesFromSyncDBUnderProfileNode(&new_sync_profiles));
   ASSERT_EQ(1U, new_sync_profiles.size());
   // Check that key fields are the same.
   EXPECT_TRUE(new_sync_profiles[0].IsSubsetOf(sync_profile, "en-US"));
   // Make sure the additional information from the sync profile was kept.
   EXPECT_EQ(ASCIIToUTF16("Fox"),
             new_sync_profiles[0].GetRawInfo(ServerFieldType::COMPANY_NAME));
   // Check that the latest use date is saved.
   EXPECT_EQ(base::Time::FromTimeT(4321), new_sync_profiles[0].use_date());
   // Check that the use counts were added (default value is 1).
-  EXPECT_EQ(2U, new_sync_profiles[0].use_count());
+  EXPECT_EQ(1U, new_sync_profiles[0].use_count());
 }
 
 // Tests that a sync with a new native profile that matches an older new sync
 // profile but with less information results in the native profile being deleted
 // and replaced by the sync profile with merged usage stats.
 TEST_F(ProfileSyncServiceAutofillTest,
        HasNativeHasSyncMergeSimilarProfileCombine_SyncHasMoreInfoAndOlder) {
   // Create two almost identical profiles. The GUIDs are different and the
   // native profile has no value for company name.
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
   sync_profile.set_use_date(base::Time::FromTimeT(1234));
 
   AutofillProfile* native_profile = new AutofillProfile;
   autofill::test::SetProfileInfoWithGuid(
       native_profile, "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "", "123 Zoo St.", "unit 5",
       "Hollywood", "CA", "91601", "US", "12345678910");
   native_profile->set_use_date(base::Time::FromTimeT(4321));
 
   AutofillProfile expected_profile(sync_profile);
   expected_profile.SetRawInfo(NAME_FULL,
                               ASCIIToUTF16("Billing Mitchell Morrison"));
-  expected_profile.set_use_count(2);
+  expected_profile.set_use_count(1);
   expected_profile.set_use_date(native_profile->use_date());
 
   std::vector<AutofillProfile*> native_profiles;
   native_profiles.push_back(native_profile);
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
   EXPECT_CALL(autofill_table(),
               AddAutofillProfile(MatchProfiles(expected_profile)))
       .WillOnce(Return(true));
   EXPECT_CALL(autofill_table(),
@@ skipping 13 matching lines @@
       GetAutofillProfilesFromSyncDBUnderProfileNode(&new_sync_profiles));
   ASSERT_EQ(1U, new_sync_profiles.size());
   // Check that key fields are the same.
   EXPECT_TRUE(new_sync_profiles[0].IsSubsetOf(sync_profile, "en-US"));
   // Make sure the additional information from the sync profile was kept.
   EXPECT_EQ(ASCIIToUTF16("Fox"),
             new_sync_profiles[0].GetRawInfo(ServerFieldType::COMPANY_NAME));
   // Check that the latest use date is saved.
   EXPECT_EQ(base::Time::FromTimeT(4321), new_sync_profiles[0].use_date());
   // Check that the use counts were added (default value is 1).
-  EXPECT_EQ(2U, new_sync_profiles[0].use_count());
+  EXPECT_EQ(1U, new_sync_profiles[0].use_count());
 }
 
 // Tests that a sync with a new native profile that matches an a new sync
 // profile but with more information results in the native profile being deleted
 // and replaced by the sync profile with the native profiles additional
 // information merged in. The merge should happen even if the sync profile is
 // more recent.
 TEST_F(ProfileSyncServiceAutofillTest,
        HasNativeHasSyncMergeSimilarProfileCombine_NativeHasMoreInfo) {
   // Create two almost identical profiles. The GUIDs are different and the
   // sync profile has no value for company name.
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "", "123 Zoo St.", "unit 5",
       "Hollywood", "CA", "91601", "US", "12345678910");
   sync_profile.set_use_date(base::Time::FromTimeT(4321));
 
   AutofillProfile* native_profile = new AutofillProfile;
   autofill::test::SetProfileInfoWithGuid(
       native_profile, "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
   native_profile->set_use_date(base::Time::FromTimeT(1234));
 
   AutofillProfile expected_profile(*native_profile);
   expected_profile.SetRawInfo(NAME_FULL,
                               ASCIIToUTF16("Billing Mitchell Morrison"));
   expected_profile.set_use_date(sync_profile.use_date());
-  expected_profile.set_use_count(2);
+  expected_profile.set_use_count(1);
 
   std::vector<AutofillProfile*> native_profiles;
   native_profiles.push_back(native_profile);
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
   EXPECT_CALL(autofill_table(),
               AddAutofillProfile(MatchProfiles(expected_profile)))
       .WillOnce(Return(true));
   EXPECT_CALL(autofill_table(),
               RemoveAutofillProfile("23355099-1170-4B71-8ED4-144470CC9EBF"))
@@ skipping 13 matching lines @@
   ASSERT_EQ(1U, new_sync_profiles.size());
   // Check that key fields are the same.
   EXPECT_TRUE(new_sync_profiles[0].IsSubsetOf(expected_profile, "en-US"));
   // Make sure the addtional information of the native profile was saved into
   // the sync profile.
   EXPECT_EQ(ASCIIToUTF16("Fox"),
             new_sync_profiles[0].GetRawInfo(ServerFieldType::COMPANY_NAME));
   // Check that the latest use date is saved.
   EXPECT_EQ(base::Time::FromTimeT(4321), new_sync_profiles[0].use_date());
   // Check that the use counts were added (default value is 1).
-  EXPECT_EQ(2U, new_sync_profiles[0].use_count());
+  EXPECT_EQ(1U, new_sync_profiles[0].use_count());
 }
 
 // Tests that a sync with a new native profile that differ only by name a new
 // sync profile results in keeping both profiles.
 TEST_F(ProfileSyncServiceAutofillTest, HasNativeHasSync_DifferentPrimaryInfo) {
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
@@ skipping 277 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
              << ", " << sync_entries[i].key().value();
   }
 }