summaryrefslogtreecommitdiffstats
path: root/sync/sessions
diff options
context:
space:
mode:
authorwaffles@chromium.org <waffles@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 00:01:37 +0000
committerwaffles@chromium.org <waffles@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 00:01:37 +0000
commita461158cc5fb837f29ab8a4dbb76f68563761bf6 (patch)
tree14bc594270937722e506df1b7228b6e99b2af47c /sync/sessions
parent3183a2fea31eabc126a1f35688504c622f8fe44a (diff)
downloadchromium_src-a461158cc5fb837f29ab8a4dbb76f68563761bf6.zip
chromium_src-a461158cc5fb837f29ab8a4dbb76f68563761bf6.tar.gz
chromium_src-a461158cc5fb837f29ab8a4dbb76f68563761bf6.tar.bz2
Revert 253502 "Add base::TimeDelta::Max()."
> Add base::TimeDelta::Max(). > > TimeDelta::Max() is a maximum timedelta, larger than any timedelta you > can compare it to. The results of adding it to a time, or another time > delta are undefined. > > R=ajwong@chromium.org,mkwst@chromium.org,jar@chromium.org > TBR=jamesr@chomium.org,acolwell@chromium.org,nick@chromium.org > BUG=None > > Review URL: https://codereview.chromium.org/163413004 TBR=gavinp@chromium.org Review URL: https://codereview.chromium.org/179763006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions')
-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 b69d753..212500a 100644
--- a/sync/sessions/nudge_tracker.cc
+++ b/sync/sessions/nudge_tracker.cc
@@ -192,9 +192,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()) {
@@ -203,7 +205,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;
}