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 a3c24b8390352e5548ebeb4dd725eefd6430332b..e72c8401e4420f3e6b78daaefb09ce0e91e2b8b1 100644 |
--- a/components/network_time/network_time_tracker_unittest.cc |
+++ b/components/network_time/network_time_tracker_unittest.cc |
@@ -234,7 +234,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) { |
@@ -255,7 +256,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); |
} |
@@ -272,7 +274,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()); |
} |
@@ -284,7 +287,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); |
} |
@@ -298,7 +302,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); |
@@ -312,13 +317,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); |
@@ -326,7 +333,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); |
} |
@@ -338,7 +346,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) { |
@@ -348,7 +357,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) { |
@@ -358,7 +368,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) { |
@@ -369,7 +380,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); |
@@ -377,7 +389,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); |
} |
@@ -390,7 +403,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); |
@@ -401,7 +415,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) { |
@@ -411,10 +426,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) { |
@@ -424,10 +441,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) { |
@@ -438,10 +457,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) { |
@@ -451,7 +472,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()); |
@@ -463,7 +485,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); |
@@ -528,7 +551,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()); |
@@ -564,7 +588,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()); |
@@ -588,7 +613,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()); |
@@ -616,7 +642,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()); |
@@ -644,7 +671,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(kFetchAttemptHistogram, 1); |
histograms.ExpectTotalCount(kFetchFailedHistogram, 1); |
@@ -653,7 +681,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(kFetchAttemptHistogram, 2); |
histograms.ExpectTotalCount(kFetchFailedHistogram, 1); |