Attempt an on-demand time fetch when encountering a date invalid error

components/network_time/network_time_tracker_unittest.cc

Index: components/network_time/network_time_tracker_unittest.cc
diff --git a/components/network_time/network_time_tracker_unittest.cc b/components/network_time/network_time_tracker_unittest.cc
index 8dfaee3f8fa38e9e337708f9b2dfaef793945dd8..c32d7e9893597f11ea9af3b7e891b62fc554ebd9 100644
--- a/components/network_time/network_time_tracker_unittest.cc
+++ b/components/network_time/network_time_tracker_unittest.cc
@@ -46,7 +46,7 @@ class NetworkTimeTrackerTest : public ::testing::Test {
 
   NetworkTimeTrackerTest()
       : io_thread_("IO thread"),
-        field_trial_test_(new FieldTrialTest()),
+        field_trial_test_(FieldTrialTest::CreateForUnitTest()),
         clock_(new base::SimpleTestClock),
         tick_clock_(new base::SimpleTestTickClock),
         test_server_(new net::EmbeddedTestServer) {
@@ -57,7 +57,7 @@ class NetworkTimeTrackerTest : public ::testing::Test {
 
     field_trial_test_->SetNetworkQueriesWithVariationsService(
         true, 0.0 /* query probability */,
-        FieldTrialTest::ENABLE_FETCHES_ON_DEMAND);
+        FieldTrialTest::FETCHES_IN_BACKGROUND_AND_ON_DEMAND);
 
     tracker_.reset(new NetworkTimeTracker(
         std::unique_ptr<base::Clock>(clock_),
@@ -555,7 +555,7 @@ TEST_F(NetworkTimeTrackerTest, StartTimeFetchWhileSynced) {
 // is not configured to allow on-demand time fetches.
 TEST_F(NetworkTimeTrackerTest, StartTimeFetchWithoutVariationsParam) {
   field_trial_test_->SetNetworkQueriesWithVariationsService(
-      true, 0.0, FieldTrialTest::DISABLE_FETCHES_ON_DEMAND);
+      true, 0.0, FieldTrialTest::FETCHES_IN_BACKGROUND_ONLY);
   test_server_->RegisterRequestHandler(base::Bind(&GoodTimeResponseHandler));
   EXPECT_TRUE(test_server_->Start());
   tracker_->SetTimeServerURLForTesting(test_server_->GetURL("/"));
@@ -574,7 +574,7 @@ TEST_F(NetworkTimeTrackerTest, NoNetworkQueryWhileSynced) {
   tracker_->SetTimeServerURLForTesting(test_server_->GetURL("/"));
 
   field_trial_test_->SetNetworkQueriesWithVariationsService(
-      true, 0.0, FieldTrialTest::ENABLE_FETCHES_ON_DEMAND);
+      true, 0.0, FieldTrialTest::FETCHES_IN_BACKGROUND_AND_ON_DEMAND);
   base::Time in_network_time = clock_->Now();
   UpdateNetworkTime(in_network_time, resolution_, latency_,
                     tick_clock_->NowTicks());
@@ -586,7 +586,7 @@ TEST_F(NetworkTimeTrackerTest, NoNetworkQueryWhileSynced) {
             tracker_->GetTimerDelayForTesting());
 
   field_trial_test_->SetNetworkQueriesWithVariationsService(
-      true, 1.0, FieldTrialTest::ENABLE_FETCHES_ON_DEMAND);
+      true, 1.0, FieldTrialTest::FETCHES_IN_BACKGROUND_AND_ON_DEMAND);
   EXPECT_TRUE(tracker_->QueryTimeServiceForTesting());
   tracker_->WaitForFetchForTesting(123123123);
   EXPECT_EQ(base::TimeDelta::FromMinutes(60),
@@ -596,14 +596,15 @@ TEST_F(NetworkTimeTrackerTest, NoNetworkQueryWhileSynced) {
 TEST_F(NetworkTimeTrackerTest, NoNetworkQueryWhileFeatureDisabled) {
   // Disable network time queries and check that a query is not sent.
   field_trial_test_->SetNetworkQueriesWithVariationsService(
-      false, 0.0, FieldTrialTest::ENABLE_FETCHES_ON_DEMAND);
+      false, 0.0, FieldTrialTest::FETCHES_IN_BACKGROUND_AND_ON_DEMAND);
   EXPECT_FALSE(tracker_->QueryTimeServiceForTesting());
-  EXPECT_EQ(base::TimeDelta::FromMinutes(6),
+  // The timer is not started when the feature is disabled.
+  EXPECT_EQ(base::TimeDelta::FromMinutes(0),
             tracker_->GetTimerDelayForTesting());
 
   // Enable time queries and check that a query is sent.
   field_trial_test_->SetNetworkQueriesWithVariationsService(
-      true, 0.0, FieldTrialTest::ENABLE_FETCHES_ON_DEMAND);
+      true, 0.0, FieldTrialTest::FETCHES_IN_BACKGROUND_AND_ON_DEMAND);
   EXPECT_TRUE(tracker_->QueryTimeServiceForTesting());
   tracker_->WaitForFetchForTesting(123123123);
 }