| Index: base/debug/trace_event_unittest.cc
|
| diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
|
| index f9a8b7a3d84c2bcb65ffc33f003a15a6eadab5a5..b85b468add1f33c11eacdda9f47d4fbb76f83149 100644
|
| --- a/base/debug/trace_event_unittest.cc
|
| +++ b/base/debug/trace_event_unittest.cc
|
| @@ -58,10 +58,10 @@ class TraceEventTestFixture : public testing::Test {
|
| json_output_.json_output.clear();
|
| }
|
|
|
| - virtual void SetUp() {
|
| + virtual void SetUp() OVERRIDE {
|
| old_thread_name_ = PlatformThread::GetName();
|
| }
|
| - virtual void TearDown() {
|
| + virtual void TearDown() OVERRIDE {
|
| if (TraceLog::GetInstance())
|
| EXPECT_FALSE(TraceLog::GetInstance()->IsEnabled());
|
| PlatformThread::SetName(old_thread_name_ ? old_thread_name_ : "");
|
|
|