summaryrefslogtreecommitdiffstats
path: root/base/files
diff options
context:
space:
mode:
Diffstat (limited to 'base/files')
-rw-r--r--base/files/file_path_unittest.cc4
-rw-r--r--base/files/file_path_watcher_browsertest.cc8
-rw-r--r--base/files/file_path_watcher_fsevents.h6
-rw-r--r--base/files/file_path_watcher_kqueue.h12
-rw-r--r--base/files/file_path_watcher_linux.cc8
-rw-r--r--base/files/file_path_watcher_mac.cc6
-rw-r--r--base/files/file_path_watcher_stub.cc6
-rw-r--r--base/files/file_path_watcher_win.cc8
-rw-r--r--base/files/file_proxy_unittest.cc2
-rw-r--r--base/files/file_util_proxy_unittest.cc2
-rw-r--r--base/files/file_util_unittest.cc4
-rw-r--r--base/files/important_file_writer_unittest.cc2
-rw-r--r--base/files/memory_mapped_file_unittest.cc2
13 files changed, 35 insertions, 35 deletions
diff --git a/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc
index 8b6f3a8..906d8df 100644
--- a/base/files/file_path_unittest.cc
+++ b/base/files/file_path_unittest.cc
@@ -50,10 +50,10 @@ struct UTF8TestData {
// to be a PlatformTest
class FilePathTest : public PlatformTest {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
PlatformTest::SetUp();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
PlatformTest::TearDown();
}
};
diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc
index 5cf75fc..f6d6d33 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());
}
diff --git a/base/files/file_path_watcher_fsevents.h b/base/files/file_path_watcher_fsevents.h
index 5640b4d..d2fb8da 100644
--- a/base/files/file_path_watcher_fsevents.h
+++ b/base/files/file_path_watcher_fsevents.h
@@ -38,8 +38,8 @@ class FilePathWatcherFSEvents : public FilePathWatcher::PlatformDelegate {
// FilePathWatcher::PlatformDelegate overrides.
virtual bool Watch(const FilePath& path,
bool recursive,
- const FilePathWatcher::Callback& callback) OVERRIDE;
- virtual void Cancel() OVERRIDE;
+ const FilePathWatcher::Callback& callback) override;
+ virtual void Cancel() override;
private:
virtual ~FilePathWatcherFSEvents();
@@ -51,7 +51,7 @@ class FilePathWatcherFSEvents : public FilePathWatcher::PlatformDelegate {
void StartEventStream(FSEventStreamEventId start_event);
// Cleans up and stops the event stream.
- virtual void CancelOnMessageLoopThread() OVERRIDE;
+ virtual void CancelOnMessageLoopThread() override;
// Callback to notify upon changes.
FilePathWatcher::Callback callback_;
diff --git a/base/files/file_path_watcher_kqueue.h b/base/files/file_path_watcher_kqueue.h
index 703fda6..aa13af3 100644
--- a/base/files/file_path_watcher_kqueue.h
+++ b/base/files/file_path_watcher_kqueue.h
@@ -33,17 +33,17 @@ class FilePathWatcherKQueue : public FilePathWatcher::PlatformDelegate,
FilePathWatcherKQueue();
// MessageLoopForIO::Watcher overrides.
- virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
- virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
+ virtual void OnFileCanReadWithoutBlocking(int fd) override;
+ virtual void OnFileCanWriteWithoutBlocking(int fd) override;
// MessageLoop::DestructionObserver overrides.
- virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
+ virtual void WillDestroyCurrentMessageLoop() override;
// FilePathWatcher::PlatformDelegate overrides.
virtual bool Watch(const FilePath& path,
bool recursive,
- const FilePathWatcher::Callback& callback) OVERRIDE;
- virtual void Cancel() OVERRIDE;
+ const FilePathWatcher::Callback& callback) override;
+ virtual void Cancel() override;
protected:
virtual ~FilePathWatcherKQueue();
@@ -60,7 +60,7 @@ class FilePathWatcherKQueue : public FilePathWatcher::PlatformDelegate,
typedef std::vector<struct kevent> EventVector;
// Can only be called on |io_message_loop_|'s thread.
- virtual void CancelOnMessageLoopThread() OVERRIDE;
+ virtual void CancelOnMessageLoopThread() override;
// Returns true if the kevent values are error free.
bool AreKeventValuesValid(struct kevent* kevents, int count);
diff --git a/base/files/file_path_watcher_linux.cc b/base/files/file_path_watcher_linux.cc
index d5d664e..fb5ba62 100644
--- a/base/files/file_path_watcher_linux.cc
+++ b/base/files/file_path_watcher_linux.cc
@@ -112,18 +112,18 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
// Returns true if watch for |path| has been added successfully.
virtual bool Watch(const FilePath& path,
bool recursive,
- const FilePathWatcher::Callback& callback) OVERRIDE;
+ const FilePathWatcher::Callback& callback) override;
// Cancel the watch. This unregisters the instance with InotifyReader.
- virtual void Cancel() OVERRIDE;
+ virtual void Cancel() override;
// Cleans up and stops observing the message_loop() thread.
- virtual void CancelOnMessageLoopThread() OVERRIDE;
+ virtual void CancelOnMessageLoopThread() override;
// Deletion of the FilePathWatcher will call Cancel() to dispose of this
// object in the right thread. This also observes destruction of the required
// cleanup thread, in case it quits before Cancel() is called.
- virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
+ virtual void WillDestroyCurrentMessageLoop() override;
// Inotify watches are installed for all directory components of |target_|. A
// WatchEntry instance holds the watch descriptor for a component and the
diff --git a/base/files/file_path_watcher_mac.cc b/base/files/file_path_watcher_mac.cc
index b21ba1d..58f78bd 100644
--- a/base/files/file_path_watcher_mac.cc
+++ b/base/files/file_path_watcher_mac.cc
@@ -17,7 +17,7 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
public:
virtual bool Watch(const FilePath& path,
bool recursive,
- const FilePathWatcher::Callback& callback) OVERRIDE {
+ const FilePathWatcher::Callback& callback) override {
// Use kqueue for non-recursive watches and FSEvents for recursive ones.
DCHECK(!impl_.get());
if (recursive) {
@@ -33,13 +33,13 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
return impl_->Watch(path, recursive, callback);
}
- virtual void Cancel() OVERRIDE {
+ virtual void Cancel() override {
if (impl_.get())
impl_->Cancel();
set_cancelled();
}
- virtual void CancelOnMessageLoopThread() OVERRIDE {
+ virtual void CancelOnMessageLoopThread() override {
if (impl_.get())
impl_->Cancel();
set_cancelled();
diff --git a/base/files/file_path_watcher_stub.cc b/base/files/file_path_watcher_stub.cc
index afca0da..d7ad206 100644
--- a/base/files/file_path_watcher_stub.cc
+++ b/base/files/file_path_watcher_stub.cc
@@ -15,13 +15,13 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
public:
virtual bool Watch(const FilePath& path,
bool recursive,
- const FilePathWatcher::Callback& callback) OVERRIDE {
+ const FilePathWatcher::Callback& callback) override {
return false;
}
- virtual void Cancel() OVERRIDE {}
+ virtual void Cancel() override {}
- virtual void CancelOnMessageLoopThread() OVERRIDE {}
+ virtual void CancelOnMessageLoopThread() override {}
protected:
virtual ~FilePathWatcherImpl() {}
diff --git a/base/files/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc
index 54a2388..98169ab 100644
--- a/base/files/file_path_watcher_win.cc
+++ b/base/files/file_path_watcher_win.cc
@@ -30,13 +30,13 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
// FilePathWatcher::PlatformDelegate overrides.
virtual bool Watch(const FilePath& path,
bool recursive,
- const FilePathWatcher::Callback& callback) OVERRIDE;
- virtual void Cancel() OVERRIDE;
+ const FilePathWatcher::Callback& callback) override;
+ virtual void Cancel() override;
// Deletion of the FilePathWatcher will call Cancel() to dispose of this
// object in the right thread. This also observes destruction of the required
// cleanup thread, in case it quits before Cancel() is called.
- virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
+ virtual void WillDestroyCurrentMessageLoop() override;
// Callback from MessageLoopForIO.
virtual void OnObjectSignaled(HANDLE object);
@@ -59,7 +59,7 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
void DestroyWatch();
// Cleans up and stops observing the |message_loop_| thread.
- void CancelOnMessageLoopThread() OVERRIDE;
+ void CancelOnMessageLoopThread() override;
// Callback to notify upon changes.
FilePathWatcher::Callback callback_;
diff --git a/base/files/file_proxy_unittest.cc b/base/files/file_proxy_unittest.cc
index 2c62fa9..0034a1c 100644
--- a/base/files/file_proxy_unittest.cc
+++ b/base/files/file_proxy_unittest.cc
@@ -24,7 +24,7 @@ class FileProxyTest : public testing::Test {
bytes_written_(-1),
weak_factory_(this) {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(dir_.CreateUniqueTempDir());
ASSERT_TRUE(file_thread_.Start());
}
diff --git a/base/files/file_util_proxy_unittest.cc b/base/files/file_util_proxy_unittest.cc
index a18cd43..87ae66a 100644
--- a/base/files/file_util_proxy_unittest.cc
+++ b/base/files/file_util_proxy_unittest.cc
@@ -23,7 +23,7 @@ class FileUtilProxyTest : public testing::Test {
bytes_written_(-1),
weak_factory_(this) {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(dir_.CreateUniqueTempDir());
ASSERT_TRUE(file_thread_.Start());
}
diff --git a/base/files/file_util_unittest.cc b/base/files/file_util_unittest.cc
index 47dec30..b3e345c 100644
--- a/base/files/file_util_unittest.cc
+++ b/base/files/file_util_unittest.cc
@@ -184,7 +184,7 @@ const int FILES_AND_DIRECTORIES =
// to be a PlatformTest
class FileUtilTest : public PlatformTest {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
PlatformTest::SetUp();
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
@@ -2151,7 +2151,7 @@ TEST_F(FileUtilTest, IsDirectoryEmpty) {
// with a common SetUp() method.
class VerifyPathControlledByUserTest : public FileUtilTest {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
FileUtilTest::SetUp();
// Create a basic structure used by each test.
diff --git a/base/files/important_file_writer_unittest.cc b/base/files/important_file_writer_unittest.cc
index c55f0cc..71242ee 100644
--- a/base/files/important_file_writer_unittest.cc
+++ b/base/files/important_file_writer_unittest.cc
@@ -33,7 +33,7 @@ class DataSerializer : public ImportantFileWriter::DataSerializer {
explicit DataSerializer(const std::string& data) : data_(data) {
}
- virtual bool SerializeData(std::string* output) OVERRIDE {
+ virtual bool SerializeData(std::string* output) override {
output->assign(data_);
return true;
}
diff --git a/base/files/memory_mapped_file_unittest.cc b/base/files/memory_mapped_file_unittest.cc
index 6627d40..36999bf 100644
--- a/base/files/memory_mapped_file_unittest.cc
+++ b/base/files/memory_mapped_file_unittest.cc
@@ -29,7 +29,7 @@ bool CheckBufferContents(const uint8* data, size_t size, size_t offset) {
class MemoryMappedFileTest : public PlatformTest {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
PlatformTest::SetUp();
CreateTemporaryFile(&temp_file_path_);
}
generated by cgit v1.1 at 2025-03-17 22:19:36 +0000