Index: base/message_loop/message_pump_perftest.cc |
diff --git a/base/message_loop/message_pump_perftest.cc b/base/message_loop/message_pump_perftest.cc |
index b3e5604c8133a4576b872861b1a67b6e8595bb36..7d833befa6158a33b5e64810a928c85abf547798 100644 |
--- a/base/message_loop/message_pump_perftest.cc |
+++ b/base/message_loop/message_pump_perftest.cc |
@@ -20,7 +20,6 @@ |
#endif |
namespace base { |
-namespace { |
class ScheduleWorkTest : public testing::Test { |
public: |
@@ -30,9 +29,9 @@ class ScheduleWorkTest : public testing::Test { |
void Schedule(int index) { |
base::TimeTicks start = base::TimeTicks::Now(); |
- base::TimeTicks thread_start; |
- if (TimeTicks::IsThreadNowSupported()) |
- thread_start = base::TimeTicks::ThreadNow(); |
+ base::ThreadTicks thread_start; |
+ if (ThreadTicks::IsSupported()) |
+ thread_start = base::ThreadTicks::Now(); |
base::TimeDelta minimum = base::TimeDelta::Max(); |
base::TimeDelta maximum = base::TimeDelta(); |
base::TimeTicks now, lastnow = start; |
@@ -50,9 +49,9 @@ class ScheduleWorkTest : public testing::Test { |
} while (now - start < base::TimeDelta::FromSeconds(kTargetTimeSec)); |
scheduling_times_[index] = now - start; |
- if (TimeTicks::IsThreadNowSupported()) |
+ if (ThreadTicks::IsSupported()) |
scheduling_thread_times_[index] = |
- base::TimeTicks::ThreadNow() - thread_start; |
+ base::ThreadTicks::Now() - thread_start; |
min_batch_times_[index] = minimum; |
max_batch_times_[index] = maximum; |
target_message_loop()->PostTask(FROM_HERE, |
@@ -140,7 +139,7 @@ class ScheduleWorkTest : public testing::Test { |
max_batch_time.InMicroseconds() / static_cast<double>(kBatchSize), |
"us/task", |
false); |
- if (TimeTicks::IsThreadNowSupported()) { |
+ if (ThreadTicks::IsSupported()) { |
perf_test::PrintResult( |
"task", |
"_thread_time", |
@@ -224,9 +223,6 @@ TEST_F(ScheduleWorkTest, ThreadTimeToJavaFromFourThreads) { |
} |
#endif |
-static void DoNothing() { |
-} |
- |
class FakeMessagePump : public MessagePump { |
public: |
FakeMessagePump() {} |
@@ -289,5 +285,4 @@ TEST_F(PostTaskTest, OneHundredTasksPerReload) { |
Run(1000, 100); |
} |
-} // namespace |
} // namespace base |