| Index: base/files/file_path_watcher_browsertest.cc
|
| diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc
|
| index 5cf75fc35c953812ee246d303043b28a0944d3e0..6f1657ce1353a917a14594557da4d9c114620d7a 100644
|
| --- a/base/files/file_path_watcher_browsertest.cc
|
| +++ b/base/files/file_path_watcher_browsertest.cc
|
| @@ -113,7 +113,7 @@ class TestDelegate : public TestDelegateBase {
|
| }
|
| virtual ~TestDelegate() {}
|
|
|
| - virtual void OnFileChanged(const FilePath& path, bool error) OVERRIDE {
|
| + void OnFileChanged(const FilePath& path, bool error) override {
|
| if (error)
|
| ADD_FAILURE() << "Error " << path.value();
|
| else
|
| @@ -146,7 +146,7 @@ class FilePathWatcherTest : public testing::Test {
|
| virtual ~FilePathWatcherTest() {}
|
|
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + void SetUp() override {
|
| // Create a separate file thread in order to test proper thread usage.
|
| base::Thread::Options options(MessageLoop::TYPE_IO, 0);
|
| ASSERT_TRUE(file_thread_.StartWithOptions(options));
|
| @@ -154,9 +154,7 @@ class FilePathWatcherTest : public testing::Test {
|
| collector_ = new NotificationCollector();
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| - RunLoop().RunUntilIdle();
|
| - }
|
| + void TearDown() override { RunLoop().RunUntilIdle(); }
|
|
|
| void DeleteDelegateOnFileThread(TestDelegate* delegate) {
|
| file_thread_.message_loop_proxy()->DeleteSoon(FROM_HERE, delegate);
|
| @@ -274,7 +272,7 @@ class Deleter : public TestDelegateBase {
|
| }
|
| virtual ~Deleter() {}
|
|
|
| - virtual void OnFileChanged(const FilePath&, bool) OVERRIDE {
|
| + void OnFileChanged(const FilePath&, bool) override {
|
| watcher_.reset();
|
| loop_->PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
|
| }
|
|
|