summaryrefslogtreecommitdiffstats
path: root/base/tracked_objects_unittest.cc
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 22:40:27 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 22:40:27 +0000
commitc25db185303fdcc66f0411ad4b0216c2342b0a21 (patch)
treec0c71fe14f403c9a625e1fa19ec3e4381640675e /base/tracked_objects_unittest.cc
parent673728d901f7e31ce75e073d120f6647c25519a2 (diff)
downloadchromium_src-c25db185303fdcc66f0411ad4b0216c2342b0a21.zip
chromium_src-c25db185303fdcc66f0411ad4b0216c2342b0a21.tar.gz
chromium_src-c25db185303fdcc66f0411ad4b0216c2342b0a21.tar.bz2
Switch to using an intergral type for durations inside profiler
Transition from internal used of "class Duration" (which is kindred of base::TimeDelta) to using an integral type. This is in preparation for handling durations that are not time based, such as memmory allocation units. r=rtenneti BUG=103321 Review URL: http://codereview.chromium.org/8502001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked_objects_unittest.cc')
-rw-r--r--base/tracked_objects_unittest.cc22
1 files changed, 10 insertions, 12 deletions
diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc
index de7451a..fd2f2ad 100644
--- a/base/tracked_objects_unittest.cc
+++ b/base/tracked_objects_unittest.cc
@@ -118,27 +118,25 @@ TEST_F(TrackedObjectsTest, DeathDataTest) {
scoped_ptr<DeathData> data(new DeathData());
ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
- EXPECT_EQ(data->run_duration(), Duration());
- EXPECT_EQ(data->queue_duration(), Duration());
+ EXPECT_EQ(data->run_duration(), 0);
+ EXPECT_EQ(data->queue_duration(), 0);
EXPECT_EQ(data->AverageMsRunDuration(), 0);
EXPECT_EQ(data->AverageMsQueueDuration(), 0);
EXPECT_EQ(data->count(), 0);
- int run_ms = 42;
- int queue_ms = 8;
+ DurationInt run_ms = 42;
+ DurationInt queue_ms = 8;
- Duration run_duration = Duration().FromMilliseconds(run_ms);
- Duration queue_duration = Duration().FromMilliseconds(queue_ms);
- data->RecordDeath(queue_duration, run_duration);
- EXPECT_EQ(data->run_duration(), run_duration);
- EXPECT_EQ(data->queue_duration(), queue_duration);
+ data->RecordDeath(queue_ms, run_ms);
+ EXPECT_EQ(data->run_duration(), run_ms);
+ EXPECT_EQ(data->queue_duration(), queue_ms);
EXPECT_EQ(data->AverageMsRunDuration(), run_ms);
EXPECT_EQ(data->AverageMsQueueDuration(), queue_ms);
EXPECT_EQ(data->count(), 1);
- data->RecordDeath(queue_duration, run_duration);
- EXPECT_EQ(data->run_duration(), run_duration + run_duration);
- EXPECT_EQ(data->queue_duration(), queue_duration + queue_duration);
+ data->RecordDeath(queue_ms, run_ms);
+ EXPECT_EQ(data->run_duration(), run_ms + run_ms);
+ EXPECT_EQ(data->queue_duration(), queue_ms + queue_ms);
EXPECT_EQ(data->AverageMsRunDuration(), run_ms);
EXPECT_EQ(data->AverageMsQueueDuration(), queue_ms);
EXPECT_EQ(data->count(), 2);