Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2416)

Unified Diff: base/files/file_path_watcher_browsertest.cc

Issue 611153004: replace OVERRIDE and FINAL with override and final in base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CC_ -> BASE_ Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/files/file_path_unittest.cc ('k') | base/files/file_path_watcher_fsevents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..f6d6d333a0fb11f366010cdc4a2e2c7149d2c7fe 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 {
+ virtual 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 {
+ virtual 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,7 +154,7 @@ class FilePathWatcherTest : public testing::Test {
collector_ = new NotificationCollector();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
RunLoop().RunUntilIdle();
}
@@ -274,7 +274,7 @@ class Deleter : public TestDelegateBase {
}
virtual ~Deleter() {}
- virtual void OnFileChanged(const FilePath&, bool) OVERRIDE {
+ virtual void OnFileChanged(const FilePath&, bool) override {
watcher_.reset();
loop_->PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
}
« no previous file with comments | « base/files/file_path_unittest.cc ('k') | base/files/file_path_watcher_fsevents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698