diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
| commit | 96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch) | |
| tree | 4332d128a05777ae34641ca2f185b7b548330b8d /cc/timer_unittest.cc | |
| parent | 1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff) | |
| download | chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.zip chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.gz chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.bz2 | |
cc: Rename cc classes and members to match filenames
Fixed reland of https://chromiumcodereview.appspot.com/11189043/
TBR=jam@chromium.org,jamesr@chromium.org
BUG=155413
Review URL: https://codereview.chromium.org/11231054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/timer_unittest.cc')
| -rw-r--r-- | cc/timer_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cc/timer_unittest.cc b/cc/timer_unittest.cc index 4be6e6e..9a540c1 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); } |