[Autofill] Make use of the test clock for Flaky test SaveImportedProfile

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 4236 matching lines @@
   FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes();
   std::unique_ptr<CreditCard> imported_credit_card2;
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure2, false,
                                               &imported_credit_card2));
   EXPECT_FALSE(imported_credit_card2);
 }
 
 // Tests the SaveImportedProfile method with different profiles to make sure the
 // merge logic works correctly.
-// Flaky on TSan, see crbug.com/686226.
-#if defined(THREAD_SANITIZER)
-#define MAYBE_SaveImportedProfile DISABLED_SaveImportedProfile
-#else
-#define MAYBE_SaveImportedProfile SaveImportedProfile
-#endif
-
-TEST_F(PersonalDataManagerTest, MAYBE_SaveImportedProfile) {
+TEST_F(PersonalDataManagerTest, SaveImportedProfile) {
   typedef struct {
     autofill::ServerFieldType field_type;
     std::string field_value;
   } ProfileField;
 
   typedef std::vector<ProfileField> ProfileFields;
 
   typedef struct {
     // Each test starts with a default pre-existing profile and applies these
     // changes to it.
@@ skipping 241 matching lines @@
        {{ADDRESS_HOME_STATE, "CA"}}},
 
       // Tests that saving and identical profile except that the company name
       // has different punctuation and case results in a merge and that the
       // syntax of the new profile replaces the old one.
       {{{COMPANY_NAME, "Stark inc"}},
        {{COMPANY_NAME, "Stark Inc."}},
        {{COMPANY_NAME, "Stark Inc."}}},
   };
 
+  // Create the test clock.
+  TestAutofillClock test_clock;
+
   for (TestCase test_case : test_cases) {
+    // Set the time to a specific value.
+    test_clock.SetNow(kArbitraryTime);
+
     SetupReferenceProfile();
     const std::vector<AutofillProfile*>& initial_profiles =
         personal_data_->GetProfiles();
 
     // Apply changes to the original profile (if applicable).
     for (ProfileField change : test_case.changes_to_original) {
       initial_profiles.front()->SetRawInfo(
           change.field_type, base::UTF8ToUTF16(change.field_value));
     }
 
+    // Set the time to a bigger value.
+    test_clock.SetNow(kSomeLaterTime);
+
     AutofillProfile profile2(base::GenerateGUID(), "https://www.example.com");
     test::SetProfileInfo(&profile2, "Marion", "Mitchell", "Morrison",
                          "johnwayne@me.xyz", "Fox", "123 Zoo St", "unit 5",
                          "Hollywood", "CA", "91601", "US", "12345678910");
 
     // Apply changes to the second profile (if applicable).
     for (ProfileField change : test_case.changes_to_new) {
       profile2.SetRawInfo(change.field_type,
                           base::UTF8ToUTF16(change.field_value));
     }
@@ skipping 11 matching lines @@
       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 properly updated.
       EXPECT_EQ(1U, saved_profiles.front()->use_count());
-      EXPECT_GT(base::TimeDelta::FromMilliseconds(500),
-                AutofillClock::Now() - saved_profiles.front()->use_date());
-      EXPECT_GT(
-          base::TimeDelta::FromMilliseconds(500),
-          AutofillClock::Now() - saved_profiles.front()->modification_date());
+      EXPECT_EQ(kSomeLaterTime, saved_profiles.front()->use_date());
+      EXPECT_EQ(kSomeLaterTime, saved_profiles.front()->modification_date());
     }
 
     // Erase the profiles for the next test.
     ResetProfiles();
   }
 }
 
 // Tests that MergeProfile tries to merge the imported profile into the
 // existing profile in decreasing order of frecency.
 TEST_F(PersonalDataManagerTest, MergeProfile_Frecency) {
@@ skipping 1112 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