[Autofill] Use base::Time::Now instead of AutofillClock::Now in autofill_tets_utils

Initially when the usage of test clocks was unified [1], there was an exception for Next* functions in autofill_test_utils that used base::Time::Now instead of AutofillClock::Now. However later, probably because of presubmit suggestion, it was replaced with AutofillClock::Time as well [2].
Also unified usage of Next* functions.

Might be the cause of test flakiness.

[1]https://chromium-review.googlesource.com/c/chromium/src/+/1850434
[2]https://chromium-review.googlesource.com/c/chromium/src/+/2103654

Bug: 1108232
Change-Id: I025075126f7cc387d5744b21f1199ddb22d00f57
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2428986
Commit-Queue: Elizabeth Popova <lizapopova@google.com>
Reviewed-by: Christoph Schwering <schwering@google.com>
Cr-Commit-Position: refs/heads/master@{#810583}

components/autofill/core/browser/autofill_test_utils.cc

@@ -879,22 +879,26 @@ std::string ObfuscatedCardDigitsAsUTF8(const std::string& str) {
 
 std::string NextMonth() {
   base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
+  // Using AutofillClock here might cause test flakiness. See crbug/1108232.
+  base::Time::Now().LocalExplode(&now);
   return base::StringPrintf("%02d", now.month % 12 + 1);
 }
 std::string LastYear() {
   base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
+  // Using AutofillClock here might cause test flakiness. See crbug/1108232.
+  base::Time::Now().LocalExplode(&now);
   return base::NumberToString(now.year - 1);
 }
 std::string NextYear() {
   base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
+  // Using AutofillClock here might cause test flakiness. See crbug/1108232.
+  base::Time::Now().LocalExplode(&now);
   return base::NumberToString(now.year + 1);
 }
 std::string TenYearsFromNow() {
   base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
+  // Using AutofillClock here might cause test flakiness. See crbug/1108232.
+  base::Time::Now().LocalExplode(&now);
   return base::NumberToString(now.year + 10);
 }
 

components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc

@@ -133,18 +133,6 @@ class TestAccessor : public CreditCardAccessManager::Accessor {
   base::WeakPtrFactory<TestAccessor> weak_ptr_factory_{this};
 };
 
-std::string NextYear() {
-  base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
-  return base::NumberToString(now.year + 1);
-}
-
-std::string NextMonth() {
-  base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
-  return base::NumberToString(now.month % 12 + 1);
-}
-
 }  // namespace
 
 class CreditCardAccessManagerTest : public testing::Test {
@@ -217,7 +205,8 @@ class CreditCardAccessManagerTest : public testing::Test {
   void CreateLocalCard(std::string guid, std::string number = std::string()) {
     CreditCard local_card = CreditCard();
     test::SetCreditCardInfo(&local_card, "Elvis Presley", number.c_str(),
-                            NextMonth().c_str(), NextYear().c_str(), "1");
+                            test::NextMonth().c_str(), test::NextYear().c_str(),
+                            "1");
     local_card.set_guid(guid);
     local_card.set_record_type(CreditCard::LOCAL_CARD);
 
@@ -229,7 +218,8 @@ class CreditCardAccessManagerTest : public testing::Test {
                         bool masked = true) {
     CreditCard server_card = CreditCard();
     test::SetCreditCardInfo(&server_card, "Elvis Presley", number.c_str(),
-                            NextMonth().c_str(), NextYear().c_str(), "1");
+                            test::NextMonth().c_str(), test::NextYear().c_str(),
+                            "1");
     server_card.set_guid(guid);
     server_card.set_record_type(masked ? CreditCard::MASKED_SERVER_CARD
                                        : CreditCard::FULL_SERVER_CARD);

components/autofill/core/browser/payments/credit_card_cvc_authenticator_unittest.cc

@@ -74,18 +74,6 @@ namespace {
 const char kTestGUID[] = "00000000-0000-0000-0000-000000000001";
 const char kTestNumber[] = "4234567890123456";  // Visa
 
-std::string NextYear() {
-  base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
-  return base::NumberToString(now.year + 1);
-}
-
-std::string NextMonth() {
-  base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
-  return base::NumberToString(now.month % 12 + 1);
-}
-
 }  // namespace
 
 class CreditCardCVCAuthenticatorTest : public testing::Test {
@@ -129,8 +117,8 @@ class CreditCardCVCAuthenticatorTest : public testing::Test {
   CreditCard CreateServerCard(std::string guid, std::string number) {
     CreditCard masked_server_card = CreditCard();
     test::SetCreditCardInfo(&masked_server_card, "Elvis Presley",
-                            number.c_str(), NextMonth().c_str(),
-                            NextYear().c_str(), "1");
+                            number.c_str(), test::NextMonth().c_str(),
+                            test::NextYear().c_str(), "1");
     masked_server_card.set_guid(guid);
     masked_server_card.set_record_type(CreditCard::MASKED_SERVER_CARD);
 

components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc

@@ -89,12 +89,6 @@ const char kTestCredentialId[] = "VGhpcyBpcyBhIHRlc3QgQ3JlZGVudGlhbCBJRC4=";
 const char kTestSignature[] = "VGhpcyBpcyBhIHRlc3Qgc2lnbmF0dXJl";
 const char kTestAuthToken[] = "dummy_card_authorization_token";
 
-std::string NextMonth() {
-  base::Time::Exploded now;
-  AutofillClock::Now().LocalExplode(&now);
-  return base::NumberToString(now.month % 12 + 1);
-}
-
 std::vector<uint8_t> Base64ToBytes(std::string base64) {
   std::string bytes;
   bool did_succeed = base::Base64Decode(base::StringPiece(base64), &bytes);
@@ -152,7 +146,7 @@ class CreditCardFIDOAuthenticatorTest : public testing::Test {
   CreditCard CreateServerCard(std::string guid, std::string number) {
     CreditCard masked_server_card = CreditCard();
     test::SetCreditCardInfo(&masked_server_card, "Elvis Presley",
-                            number.c_str(), NextMonth().c_str(),
+                            number.c_str(), test::NextMonth().c_str(),
                             test::NextYear().c_str(), "1");
     masked_server_card.set_guid(guid);
     masked_server_card.set_record_type(CreditCard::MASKED_SERVER_CARD);