summaryrefslogtreecommitdiffstats
path: root/sync/sessions/nudge_tracker.cc
diff options
context:
space:
mode:
authorapavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 10:58:15 +0000
committerapavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 10:58:15 +0000
commit6857bbab378b7ae7f61399ff4af03ca2fcbe6c60 (patch)
tree0407945f372c0764e77297987de13832e5812aa9 /sync/sessions/nudge_tracker.cc
parent0fb050ca8edb8f9d5ec3c703784281796c107407 (diff)
downloadchromium_src-6857bbab378b7ae7f61399ff4af03ca2fcbe6c60.zip
chromium_src-6857bbab378b7ae7f61399ff4af03ca2fcbe6c60.tar.gz
chromium_src-6857bbab378b7ae7f61399ff4af03ca2fcbe6c60.tar.bz2
Revert of Reland "Add base::TimeDelta::Max()" (https://codereview.chromium.org/183763011/)
Reason for revert: http/tests/media/video-cookie.html is asserting on debug bots Original issue's description: > Reland "Add base::TimeDelta::Max()" > > Media was exposing max timedeltas to JSON, which wasn't working with > infinity. > > R=scherkus@chromium.org > TBR=ajwong@chromium.org,jar@chromium.org,jamesr@chomium.org,acolwell@chromium.org,nick@chromium.org > BUG=None > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=254717 TBR=ajwong@chromium.org,jar@chromium.org,scherkus@chromium.org,jamesr@chomium.org,acolwell@chromium.org,nick@chromium.org,gavinp@chromium.org NOTREECHECKS=true NOTRY=true BUG=None Review URL: https://codereview.chromium.org/179813009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions/nudge_tracker.cc')
-rw-r--r--sync/sessions/nudge_tracker.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sync/sessions/nudge_tracker.cc b/sync/sessions/nudge_tracker.cc
index 5b599b8..22a9fe0 100644
--- a/sync/sessions/nudge_tracker.cc
+++ b/sync/sessions/nudge_tracker.cc
@@ -174,9 +174,11 @@ bool NudgeTracker::IsTypeThrottled(ModelType type) const {
base::TimeDelta NudgeTracker::GetTimeUntilNextUnthrottle(
base::TimeTicks now) const {
DCHECK(IsAnyTypeThrottled()) << "This function requires a pending unthrottle";
+ const base::TimeDelta kMaxTimeDelta =
+ base::TimeDelta::FromInternalValue(kint64max);
// Return min of GetTimeUntilUnthrottle() values for all IsThrottled() types.
- base::TimeDelta time_until_next_unthrottle = base::TimeDelta::Max();
+ base::TimeDelta time_until_next_unthrottle = kMaxTimeDelta;
for (TypeTrackerMap::const_iterator it = type_trackers_.begin();
it != type_trackers_.end(); ++it) {
if (it->second.IsThrottled()) {
@@ -185,7 +187,7 @@ base::TimeDelta NudgeTracker::GetTimeUntilNextUnthrottle(
it->second.GetTimeUntilUnthrottle(now));
}
}
- DCHECK(!time_until_next_unthrottle.is_max());
+ DCHECK(kMaxTimeDelta != time_until_next_unthrottle);
return time_until_next_unthrottle;
}