Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1043)

Unified Diff: base/tracked_objects_unittest.cc

Issue 846663002: Use ThreadData::Now() for TrackingInfo::time_posted initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary expectation Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/threading/worker_pool_win.cc ('k') | base/tracking_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/tracked_objects_unittest.cc
diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc
index b6fc851824e4efe66ae67f845501774b7637d92c..e2ea362fb58e2b4642ecc52a960556d12fcd1832 100644
--- a/base/tracked_objects_unittest.cc
+++ b/base/tracked_objects_unittest.cc
@@ -382,8 +382,7 @@ TEST_F(TrackedObjectsTest, LifeCycleToSnapshotMainThread) {
Location location(kFunction, kFile, kLineNumber, NULL);
TallyABirth(location, kMainThreadName);
- const base::TimeTicks kTimePosted = base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(1);
+ const TrackedTime kTimePosted = TrackedTime::FromMilliseconds(1);
const base::TimeTicks kDelayedStartTime = base::TimeTicks();
// TrackingInfo will call TallyABirth() during construction.
base::TrackingInfo pending_task(location, kDelayedStartTime);
@@ -419,8 +418,7 @@ TEST_F(TrackedObjectsTest, LifeCycleMidDeactivatedToSnapshotMainThread) {
Location location(kFunction, kFile, kLineNumber, NULL);
TallyABirth(location, kMainThreadName);
- const base::TimeTicks kTimePosted = base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(1);
+ const TrackedTime kTimePosted = TrackedTime::FromMilliseconds(1);
const base::TimeTicks kDelayedStartTime = base::TimeTicks();
// TrackingInfo will call TallyABirth() during construction.
base::TrackingInfo pending_task(location, kDelayedStartTime);
@@ -458,8 +456,7 @@ TEST_F(TrackedObjectsTest, LifeCyclePreDeactivatedToSnapshotMainThread) {
Location location(kFunction, kFile, kLineNumber, NULL);
TallyABirth(location, kMainThreadName);
- const base::TimeTicks kTimePosted = base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(1);
+ const TrackedTime kTimePosted = TrackedTime::FromMilliseconds(1);
const base::TimeTicks kDelayedStartTime = base::TimeTicks();
// TrackingInfo will call TallyABirth() during construction.
base::TrackingInfo pending_task(location, kDelayedStartTime);
@@ -556,8 +553,7 @@ TEST_F(TrackedObjectsTest, TwoLives) {
Location location(kFunction, kFile, kLineNumber, NULL);
TallyABirth(location, kMainThreadName);
- const base::TimeTicks kTimePosted = base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(1);
+ const TrackedTime kTimePosted = TrackedTime::FromMilliseconds(1);
const base::TimeTicks kDelayedStartTime = base::TimeTicks();
// TrackingInfo will call TallyABirth() during construction.
base::TrackingInfo pending_task(location, kDelayedStartTime);
@@ -601,8 +597,7 @@ TEST_F(TrackedObjectsTest, DifferentLives) {
const char kFunction[] = "DifferentLives";
Location location(kFunction, kFile, kLineNumber, NULL);
- const base::TimeTicks kTimePosted = base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(1);
+ const TrackedTime kTimePosted = TrackedTime::FromMilliseconds(1);
const base::TimeTicks kDelayedStartTime = base::TimeTicks();
// TrackingInfo will call TallyABirth() during construction.
base::TrackingInfo pending_task(location, kDelayedStartTime);
@@ -668,8 +663,7 @@ TEST_F(TrackedObjectsTest, TaskWithNestedExclusion) {
Location location(kFunction, kFile, kLineNumber, NULL);
TallyABirth(location, kMainThreadName);
- const base::TimeTicks kTimePosted = base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(1);
+ const TrackedTime kTimePosted = TrackedTime::FromMilliseconds(1);
const base::TimeTicks kDelayedStartTime = base::TimeTicks();
// TrackingInfo will call TallyABirth() during construction.
base::TrackingInfo pending_task(location, kDelayedStartTime);
@@ -706,8 +700,7 @@ TEST_F(TrackedObjectsTest, TaskWith2NestedExclusions) {
Location location(kFunction, kFile, kLineNumber, NULL);
TallyABirth(location, kMainThreadName);
- const base::TimeTicks kTimePosted = base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(1);
+ const TrackedTime kTimePosted = TrackedTime::FromMilliseconds(1);
const base::TimeTicks kDelayedStartTime = base::TimeTicks();
// TrackingInfo will call TallyABirth() during construction.
base::TrackingInfo pending_task(location, kDelayedStartTime);
@@ -753,8 +746,7 @@ TEST_F(TrackedObjectsTest, TaskWithNestedExclusionWithNestedTask) {
TallyABirth(location, kMainThreadName);
- const base::TimeTicks kTimePosted = base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(1);
+ const TrackedTime kTimePosted = TrackedTime::FromMilliseconds(1);
const base::TimeTicks kDelayedStartTime = base::TimeTicks();
// TrackingInfo will call TallyABirth() during construction.
base::TrackingInfo pending_task(location, kDelayedStartTime);
@@ -771,8 +763,7 @@ TEST_F(TrackedObjectsTest, TaskWithNestedExclusionWithNestedTask) {
Location second_location(kFunction, kFile, kSecondFakeLineNumber, NULL);
base::TrackingInfo nested_task(second_location, kDelayedStartTime);
// Overwrite implied Now().
- nested_task.time_posted =
- base::TimeTicks() + base::TimeDelta::FromMilliseconds(8);
+ nested_task.time_posted = TrackedTime::FromMilliseconds(8);
SetTestTime(9);
TaskStopwatch nested_task_stopwatch;
nested_task_stopwatch.Start();
« no previous file with comments | « base/threading/worker_pool_win.cc ('k') | base/tracking_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698