| Index: cc/timer_unittest.cc
|
| diff --git a/cc/timer_unittest.cc b/cc/timer_unittest.cc
|
| index 3cc497f255a09aef26544bd9883f5ccc54ef8910..2f16003b143a0c9d6428000ac658b4d17074e92c 100644
|
| --- a/cc/timer_unittest.cc
|
| +++ b/cc/timer_unittest.cc
|
| @@ -14,20 +14,20 @@ using namespace WebKitTests;
|
|
|
| namespace {
|
|
|
| -class CCTimerTest : public testing::Test, public CCTimerClient {
|
| +class TimerTest : public testing::Test, public TimerClient {
|
| public:
|
| - CCTimerTest() : m_flag(false) { }
|
| + TimerTest() : m_flag(false) { }
|
|
|
| void onTimerFired() { m_flag = true; }
|
|
|
| protected:
|
| - FakeCCThread m_thread;
|
| + FakeThread m_thread;
|
| bool m_flag;
|
| };
|
|
|
| -TEST_F(CCTimerTest, OneShot)
|
| +TEST_F(TimerTest, OneShot)
|
| {
|
| - CCTimer timer(&m_thread, this);
|
| + Timer timer(&m_thread, this);
|
| timer.startOneShot(0.001);
|
| EXPECT_TRUE(timer.isActive());
|
| m_thread.runPendingTask();
|
| @@ -36,9 +36,9 @@ TEST_F(CCTimerTest, OneShot)
|
| EXPECT_FALSE(m_thread.hasPendingTask());
|
| }
|
|
|
| -TEST_F(CCTimerTest, StopManually)
|
| +TEST_F(TimerTest, StopManually)
|
| {
|
| - CCTimer timer(&m_thread, this);
|
| + Timer timer(&m_thread, this);
|
| timer.startOneShot(0.001);
|
| EXPECT_TRUE(timer.isActive());
|
| timer.stop();
|
| @@ -49,10 +49,10 @@ TEST_F(CCTimerTest, StopManually)
|
| EXPECT_FALSE(m_thread.hasPendingTask());
|
| }
|
|
|
| -TEST_F(CCTimerTest, StopByScope)
|
| +TEST_F(TimerTest, StopByScope)
|
| {
|
| {
|
| - CCTimer timer(&m_thread, this);
|
| + Timer timer(&m_thread, this);
|
| timer.startOneShot(0.001);
|
| }
|
|
|
|
|