Use the max use count on autofill profile merge.

components/autofill/core/browser/personal_data_manager_unittest.cc

 // Copyright 2013 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/autofill/core/browser/personal_data_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 4370 matching lines @@
       EXPECT_EQ(2U, saved_profiles.size());
     } else {
       EXPECT_EQ(1U, saved_profiles.size());
 
       // Make sure the new information was merged correctly.
       for (ProfileField changed_field : test_case.changed_field_values) {
         EXPECT_EQ(base::UTF8ToUTF16(changed_field.field_value),
                   saved_profiles.front()->GetRawInfo(changed_field.field_type));
       }
       // Verify that the merged profile's use count, use date and modification
-      // date were updated.
-      EXPECT_EQ(2U, saved_profiles.front()->use_count());
+      // date were properly updated.
+      EXPECT_EQ(1U, saved_profiles.front()->use_count());
       EXPECT_GT(base::TimeDelta::FromMilliseconds(500),
                 base::Time::Now() - saved_profiles.front()->use_date());
       EXPECT_GT(
           base::TimeDelta::FromMilliseconds(500),
           base::Time::Now() - saved_profiles.front()->modification_date());
     }
 
     // Erase the profiles for the next test.
     ResetProfiles();
   }
@@ skipping 61 matching lines @@
                        "homer.simpson@abc.com", "", "742 Evergreen Terrace", "",
                        "Springfield", "IL", "91601", "US", "12345678910");
 
   // Merge the imported profile into the existing profiles.
   std::vector<AutofillProfile> profiles;
   std::string guid = personal_data_->MergeProfile(
       imported_profile, existing_profiles, "US-EN", &profiles);
 
   // The new profile should be merged into the existing profile.
   EXPECT_EQ(profile.guid(), guid);
-  // The use count should have been incremented by one.
-  EXPECT_EQ(5U, profile.use_count());
+  // The use count should have be max(4, 1) => 4.
+  EXPECT_EQ(4U, profile.use_count());
   // The use date and modification dates should have been set to less than 500
   // milliseconds ago.
   EXPECT_GT(base::TimeDelta::FromMilliseconds(500),
             base::Time::Now() - profile.use_date());
   EXPECT_GT(base::TimeDelta::FromMilliseconds(500),
             base::Time::Now() - profile.modification_date());
 }
 
 // Tests that DedupeProfiles sets the correct profile guids to
 // delete after merging similar profiles.
@@ skipping 149 matching lines @@
   // The specified phone number from profile1 should be kept (no loss of
   // information).
   EXPECT_EQ(UTF8ToUTF16("12345678910"),
             profiles[0]->GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
   // The specified company name from profile2 should be kept (no loss of
   // information).
   EXPECT_EQ(UTF8ToUTF16("Fox"), profiles[0]->GetRawInfo(COMPANY_NAME));
   // The specified country from the imported profile shoudl be kept (no loss of
   // information).
   EXPECT_EQ(UTF8ToUTF16("US"), profiles[0]->GetRawInfo(ADDRESS_HOME_COUNTRY));
-  // The use count that results from the merge should be the sum of the two
-  // saved profiles plus 1 (imported profile count).
-  EXPECT_EQ(profile1.use_count() + profile2.use_count() + profile3.use_count(),
-            profiles[0]->use_count());
+  // The use count that results from the merge should be the max of all the
+  // profiles use counts.
+  EXPECT_EQ(10U, profiles[0]->use_count());
   // The use date that results from the merge should be the one from the
   // profile1 since it was the most recently used profile.
   EXPECT_LT(profile1.use_date() - base::TimeDelta::FromSeconds(10),
             profiles[0]->use_date());
 }
 
 // Tests that ApplyDedupingRoutine only keeps the verified profile with its
 // original data when deduping with similar profiles, even if it has a higher
 // frecency score.
 TEST_F(PersonalDataManagerTest, ApplyDedupingRoutine_VerifiedProfileFirst) {
@@ skipping 443 matching lines @@
             profiles[0]->GetRawInfo(ADDRESS_HOME_LINE1));
   // The middle name should be the full version found in |Homer2|,
   EXPECT_EQ(UTF8ToUTF16("Jay"), profiles[0]->GetRawInfo(NAME_MIDDLE));
   // The phone number from |Homer2| should be kept (no loss of information).
   EXPECT_EQ(UTF8ToUTF16("12345678910"),
             profiles[0]->GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
   // The company name from |Homer3| should be kept (no loss of information).
   EXPECT_EQ(UTF8ToUTF16("Fox"), profiles[0]->GetRawInfo(COMPANY_NAME));
   // The country from |Homer1| profile should be kept (no loss of information).
   EXPECT_EQ(UTF8ToUTF16("US"), profiles[0]->GetRawInfo(ADDRESS_HOME_COUNTRY));
-  // The use count that results from the merge should be the sum of Homer 1, 2
+  // The use count that results from the merge should be the max of Homer 1, 2
   // and 3's respective use counts.
-  EXPECT_EQ(Homer1.use_count() + Homer2.use_count() + Homer3.use_count(),
-            profiles[0]->use_count());
+  EXPECT_EQ(10U, profiles[0]->use_count());
   // The use date that results from the merge should be the one from the
   // |Homer1| since it was the most recently used profile.
   EXPECT_LT(Homer1.use_date() - base::TimeDelta::FromSeconds(5),
             profiles[0]->use_date());
   EXPECT_GT(Homer1.use_date() + base::TimeDelta::FromSeconds(5),
             profiles[0]->use_date());
 
   // The other profiles should not have been modified.
   EXPECT_TRUE(Marge1 == *profiles[1]);
   EXPECT_TRUE(Homer4 == *profiles[2]);
@@ skipping 92 matching lines @@
   EnableAutofillProfileCleanup();
 
   // The deduping routine should not be run.
   EXPECT_FALSE(personal_data_->ApplyDedupingRoutine());
 
   // The two duplicate profiles should still be present.
   EXPECT_EQ(2U, personal_data_->GetProfiles().size());
 }
 
 }  // namespace autofill