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

Unified Diff: base/tracked_objects_unittest.cc

Issue 8233037: Update task tracking to not depend on message_loop_ singleton (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/tracked_objects.cc ('k') | content/browser/browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/tracked_objects_unittest.cc
===================================================================
--- base/tracked_objects_unittest.cc (revision 104925)
+++ base/tracked_objects_unittest.cc (working copy)
@@ -23,11 +23,11 @@
return;
EXPECT_FALSE(ThreadData::first()); // No activity even on this thread.
- ThreadData* data = ThreadData::current();
+ ThreadData* data = ThreadData::Get();
EXPECT_TRUE(ThreadData::first()); // Now class was constructed.
EXPECT_TRUE(data);
EXPECT_TRUE(!data->next());
- EXPECT_EQ(data, ThreadData::current());
+ EXPECT_EQ(data, ThreadData::Get());
ThreadData::BirthMap birth_map;
data->SnapshotBirthMap(&birth_map);
EXPECT_EQ(0u, birth_map.size());
@@ -39,11 +39,11 @@
// Do it again, just to be sure we reset state completely.
ThreadData::StartTracking(true);
EXPECT_FALSE(ThreadData::first()); // No activity even on this thread.
- data = ThreadData::current();
+ data = ThreadData::Get();
EXPECT_TRUE(ThreadData::first()); // Now class was constructed.
EXPECT_TRUE(data);
EXPECT_TRUE(!data->next());
- EXPECT_EQ(data, ThreadData::current());
+ EXPECT_EQ(data, ThreadData::Get());
birth_map.clear();
data->SnapshotBirthMap(&birth_map);
EXPECT_EQ(0u, birth_map.size());
@@ -64,7 +64,7 @@
const ThreadData* data = ThreadData::first();
ASSERT_TRUE(data);
EXPECT_TRUE(!data->next());
- EXPECT_EQ(data, ThreadData::current());
+ EXPECT_EQ(data, ThreadData::Get());
ThreadData::BirthMap birth_map;
data->SnapshotBirthMap(&birth_map);
EXPECT_EQ(1u, birth_map.size()); // 1 birth location.
@@ -78,7 +78,9 @@
const Births* second_birth = ThreadData::TallyABirthIfActive(location);
ThreadData::TallyADeathIfActive(
second_birth,
- base::TimeDelta::FromSeconds(1) /* Bogus duration. */);
+ base::TimeTicks::TimeTicks(), /* Bogus post_time. */
+ base::TimeTicks::TimeTicks(), /* Bogus delayed_start_time. */
+ base::TimeTicks::TimeTicks() /* Bogus start_run_time. */);
birth_map.clear();
data->SnapshotBirthMap(&birth_map);
« no previous file with comments | « base/tracked_objects.cc ('k') | content/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698