Update from https://crrev.com/333737

base/message_loop/message_pump_perftest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/java_handler_thread.h"
 #endif
 
 namespace base {
-namespace {
 
 class ScheduleWorkTest : public testing::Test {
  public:
   ScheduleWorkTest() : counter_(0) {}
 
   void Increment(uint64_t amount) { counter_ += amount; }
 
   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;
     uint64_t schedule_calls = 0u;
     do {
       for (size_t i = 0; i < kBatchSize; ++i) {
         target_message_loop()->ScheduleWork();
         schedule_calls++;
       }
       now = base::TimeTicks::Now();
       base::TimeDelta laptime = now - lastnow;
       lastnow = now;
       minimum = std::min(minimum, laptime);
       maximum = std::max(maximum, laptime);
     } 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,
                                     base::Bind(&ScheduleWorkTest::Increment,
                                                base::Unretained(this),
                                                schedule_calls));
   }
 
   void ScheduleWork(MessageLoop::Type target_type, int num_scheduling_threads) {
 #if defined(OS_ANDROID)
@@ skipping 67 matching lines @@
         min_batch_time.InMicroseconds() / static_cast<double>(kBatchSize),
         "us/task",
         false);
     perf_test::PrintResult(
         "task",
         "_max_batch_time",
         trace,
         max_batch_time.InMicroseconds() / static_cast<double>(kBatchSize),
         "us/task",
         false);
-    if (TimeTicks::IsThreadNowSupported()) {
+    if (ThreadTicks::IsSupported()) {
       perf_test::PrintResult(
           "task",
           "_thread_time",
           trace,
           total_thread_time.InMicroseconds() / static_cast<double>(counter_),
           "us/task",
           true);
     }
   }
 
@@ skipping 63 matching lines @@
 
 TEST_F(ScheduleWorkTest, ThreadTimeToJavaFromTwoThreads) {
   ScheduleWork(MessageLoop::TYPE_JAVA, 2);
 }
 
 TEST_F(ScheduleWorkTest, ThreadTimeToJavaFromFourThreads) {
   ScheduleWork(MessageLoop::TYPE_JAVA, 4);
 }
 #endif
 
-static void DoNothing() {
-}
-
 class FakeMessagePump : public MessagePump {
  public:
   FakeMessagePump() {}
   ~FakeMessagePump() override {}
 
   void Run(Delegate* delegate) override {}
 
   void Quit() override {}
   void ScheduleWork() override {}
   void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override {}
@@ skipping 42 matching lines @@
 }
 
 TEST_F(PostTaskTest, TenTasksPerReload) {
   Run(10000, 10);
 }
 
 TEST_F(PostTaskTest, OneHundredTasksPerReload) {
   Run(1000, 100);
 }
 
-}  // namespace
 }  // namespace base