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 43f7bf6aa530f0a75ca094b3781b486830e7ec7e..da3ced1d6ad065158ad3472b0fced86accd94e36 100644 |
--- a/components/network_time/network_time_tracker_unittest.cc |
+++ b/components/network_time/network_time_tracker_unittest.cc |
@@ -232,7 +232,8 @@ class NetworkTimeTrackerTest : public testing::Test { |
TEST_F(NetworkTimeTrackerTest, Uninitialized) { |
base::Time network_time; |
base::TimeDelta uncertainty; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&network_time, &uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&network_time, &uncertainty)); |
} |
TEST_F(NetworkTimeTrackerTest, LongPostingDelay) { |
@@ -253,7 +254,8 @@ TEST_F(NetworkTimeTrackerTest, LongPostingDelay) { |
base::Time out_network_time; |
base::TimeDelta uncertainty; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
EXPECT_EQ(resolution_ + latency_ + adjustment_, uncertainty); |
EXPECT_EQ(clock_->Now(), out_network_time); |
} |
@@ -270,7 +272,8 @@ TEST_F(NetworkTimeTrackerTest, LopsidedLatency) { |
// But, the answer is still within the uncertainty bounds! |
base::Time out_network_time; |
base::TimeDelta uncertainty; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
EXPECT_LT(out_network_time - uncertainty / 2, clock_->Now()); |
EXPECT_GT(out_network_time + uncertainty / 2, clock_->Now()); |
} |
@@ -282,7 +285,8 @@ TEST_F(NetworkTimeTrackerTest, ClockIsWack) { |
tick_clock_->NowTicks()); |
base::Time out_network_time; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
EXPECT_EQ(in_network_time, out_network_time); |
} |
@@ -296,7 +300,8 @@ TEST_F(NetworkTimeTrackerTest, ClocksDivergeSlightly) { |
tick_clock_->Advance(small); |
base::Time out_network_time; |
base::TimeDelta out_uncertainty; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, &out_uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, &out_uncertainty)); |
EXPECT_EQ(in_network_time + small, out_network_time); |
// The clock divergence should show up in the uncertainty. |
EXPECT_EQ(resolution_ + latency_ + adjustment_ + small, out_uncertainty); |
@@ -310,13 +315,15 @@ TEST_F(NetworkTimeTrackerTest, NetworkTimeUpdates) { |
UpdateNetworkTime(clock_->Now() - latency_ / 2, resolution_, latency_, |
tick_clock_->NowTicks()); |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
EXPECT_EQ(clock_->Now(), out_network_time); |
EXPECT_EQ(resolution_ + latency_ + adjustment_, uncertainty); |
// Fake a wait to make sure we keep tracking. |
AdvanceBoth(base::TimeDelta::FromSeconds(1)); |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
EXPECT_EQ(clock_->Now(), out_network_time); |
EXPECT_EQ(resolution_ + latency_ + adjustment_, uncertainty); |
@@ -324,7 +331,8 @@ TEST_F(NetworkTimeTrackerTest, NetworkTimeUpdates) { |
UpdateNetworkTime(clock_->Now() - latency_ / 2, resolution_, latency_, |
tick_clock_->NowTicks()); |
AdvanceBoth(base::TimeDelta::FromSeconds(1)); |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, &uncertainty)); |
EXPECT_EQ(clock_->Now(), out_network_time); |
EXPECT_EQ(resolution_ + latency_ + adjustment_, uncertainty); |
} |
@@ -336,7 +344,8 @@ TEST_F(NetworkTimeTrackerTest, SpringForward) { |
tick_clock_->Advance(base::TimeDelta::FromSeconds(1)); |
clock_->Advance(base::TimeDelta::FromDays(1)); |
base::Time out_network_time; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_SYNC_LOST, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
} |
TEST_F(NetworkTimeTrackerTest, FallBack) { |
@@ -346,7 +355,8 @@ TEST_F(NetworkTimeTrackerTest, FallBack) { |
tick_clock_->Advance(base::TimeDelta::FromSeconds(1)); |
clock_->Advance(base::TimeDelta::FromDays(-1)); |
base::Time out_network_time; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_SYNC_LOST, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
} |
TEST_F(NetworkTimeTrackerTest, SuspendAndResume) { |
@@ -356,7 +366,8 @@ TEST_F(NetworkTimeTrackerTest, SuspendAndResume) { |
tick_clock_->NowTicks()); |
clock_->Advance(base::TimeDelta::FromHours(1)); |
base::Time out_network_time; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_SYNC_LOST, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
} |
TEST_F(NetworkTimeTrackerTest, Serialize) { |
@@ -367,7 +378,8 @@ TEST_F(NetworkTimeTrackerTest, Serialize) { |
tick_clock_->NowTicks()); |
base::Time out_network_time; |
base::TimeDelta out_uncertainty; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, &out_uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, &out_uncertainty)); |
EXPECT_EQ(in_network_time, out_network_time); |
EXPECT_EQ(resolution_ + latency_ + adjustment_, out_uncertainty); |
@@ -375,7 +387,8 @@ TEST_F(NetworkTimeTrackerTest, Serialize) { |
base::TimeDelta delta = base::TimeDelta::FromDays(6); |
AdvanceBoth(delta); |
Reset(); |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, &out_uncertainty)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, &out_uncertainty)); |
EXPECT_EQ(in_network_time + delta, out_network_time); |
EXPECT_EQ(resolution_ + latency_ + adjustment_, out_uncertainty); |
} |
@@ -388,7 +401,8 @@ TEST_F(NetworkTimeTrackerTest, DeserializeOldFormat) { |
tick_clock_->NowTicks()); |
base::Time out_network_time; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
double local, network; |
const base::DictionaryValue* saved_prefs = |
pref_service_.GetDictionary(prefs::kNetworkTimeMapping); |
@@ -399,7 +413,8 @@ TEST_F(NetworkTimeTrackerTest, DeserializeOldFormat) { |
prefs.SetDouble("network", network); |
pref_service_.Set(prefs::kNetworkTimeMapping, prefs); |
Reset(); |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
} |
TEST_F(NetworkTimeTrackerTest, SerializeWithLongDelay) { |
@@ -409,10 +424,12 @@ TEST_F(NetworkTimeTrackerTest, SerializeWithLongDelay) { |
UpdateNetworkTime(in_network_time - latency_ / 2, resolution_, latency_, |
tick_clock_->NowTicks()); |
base::Time out_network_time; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
AdvanceBoth(base::TimeDelta::FromDays(8)); |
Reset(); |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
} |
TEST_F(NetworkTimeTrackerTest, SerializeWithTickClockAdvance) { |
@@ -422,10 +439,12 @@ TEST_F(NetworkTimeTrackerTest, SerializeWithTickClockAdvance) { |
UpdateNetworkTime(in_network_time - latency_ / 2, resolution_, latency_, |
tick_clock_->NowTicks()); |
base::Time out_network_time; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
tick_clock_->Advance(base::TimeDelta::FromDays(1)); |
Reset(); |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_SYNC_LOST, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
} |
TEST_F(NetworkTimeTrackerTest, SerializeWithWallClockAdvance) { |
@@ -436,10 +455,12 @@ TEST_F(NetworkTimeTrackerTest, SerializeWithWallClockAdvance) { |
tick_clock_->NowTicks()); |
base::Time out_network_time; |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
clock_->Advance(base::TimeDelta::FromDays(1)); |
Reset(); |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_SYNC_LOST, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
} |
TEST_F(NetworkTimeTrackerTest, UpdateFromNetwork) { |
@@ -448,7 +469,8 @@ TEST_F(NetworkTimeTrackerTest, UpdateFromNetwork) { |
histograms.ExpectTotalCount(kFetchValidHistogram, 0); |
base::Time out_network_time; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
// First query should happen soon. |
EXPECT_EQ(base::TimeDelta::FromMinutes(0), |
tracker_->GetTimerDelayForTesting()); |
@@ -460,7 +482,8 @@ TEST_F(NetworkTimeTrackerTest, UpdateFromNetwork) { |
EXPECT_TRUE(tracker_->QueryTimeServiceForTesting()); |
tracker_->WaitForFetchForTesting(123123123); |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
EXPECT_EQ(base::Time::UnixEpoch() + |
base::TimeDelta::FromMilliseconds(1461621971825), |
out_network_time); |
@@ -523,7 +546,8 @@ TEST_F(NetworkTimeTrackerTest, UpdateFromNetworkBadSignature) { |
tracker_->WaitForFetchForTesting(123123123); |
base::Time out_network_time; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
EXPECT_EQ(base::TimeDelta::FromMinutes(120), |
tracker_->GetTimerDelayForTesting()); |
@@ -557,7 +581,8 @@ TEST_F(NetworkTimeTrackerTest, UpdateFromNetworkBadData) { |
EXPECT_TRUE(tracker_->QueryTimeServiceForTesting()); |
tracker_->WaitForFetchForTesting(123123123); |
base::Time out_network_time; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
EXPECT_EQ(base::TimeDelta::FromMinutes(120), |
tracker_->GetTimerDelayForTesting()); |
@@ -579,7 +604,8 @@ TEST_F(NetworkTimeTrackerTest, UpdateFromNetworkServerError) { |
tracker_->WaitForFetchForTesting(123123123); |
base::Time out_network_time; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
// Should see backoff in the error case. |
EXPECT_EQ(base::TimeDelta::FromMinutes(120), |
tracker_->GetTimerDelayForTesting()); |
@@ -605,7 +631,8 @@ TEST_F(NetworkTimeTrackerTest, UpdateFromNetworkNetworkError) { |
tracker_->WaitForFetchForTesting(123123123); |
base::Time out_network_time; |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
// Should see backoff in the error case. |
EXPECT_EQ(base::TimeDelta::FromMinutes(120), |
tracker_->GetTimerDelayForTesting()); |
@@ -631,7 +658,8 @@ TEST_F(NetworkTimeTrackerTest, UpdateFromNetworkLargeResponse) { |
tracker_->SetMaxResponseSizeForTesting(3); |
EXPECT_TRUE(tracker_->QueryTimeServiceForTesting()); |
tracker_->WaitForFetchForTesting(123123123); |
- EXPECT_FALSE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_NO_SYNC, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
histograms.ExpectTotalCount(kFetchFailedHistogram, 1); |
histograms.ExpectTotalCount(kFetchValidHistogram, 0); |
@@ -639,7 +667,8 @@ TEST_F(NetworkTimeTrackerTest, UpdateFromNetworkLargeResponse) { |
tracker_->SetMaxResponseSizeForTesting(1024); |
EXPECT_TRUE(tracker_->QueryTimeServiceForTesting()); |
tracker_->WaitForFetchForTesting(123123123); |
- EXPECT_TRUE(tracker_->GetNetworkTime(&out_network_time, nullptr)); |
+ EXPECT_EQ(NetworkTimeTracker::NETWORK_TIME_AVAILABLE, |
+ tracker_->GetNetworkTime(&out_network_time, nullptr)); |
histograms.ExpectTotalCount(kFetchFailedHistogram, 1); |
histograms.ExpectTotalCount(kFetchValidHistogram, 1); |