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

Unified Diff: base/files/file_path_watcher_mac.cc

Issue 2596273003: Remove ref-counting from FilePathWatcher. (Closed)
Patch Set: self-review Created 4 years 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
Index: base/files/file_path_watcher_mac.cc
diff --git a/base/files/file_path_watcher_mac.cc b/base/files/file_path_watcher_mac.cc
index d59ca2156beb79705fa0f76c6817702d70f4dd62..a52a5690025d3053b9b12e6cd29f77f8d055fffa 100644
--- a/base/files/file_path_watcher_mac.cc
+++ b/base/files/file_path_watcher_mac.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/files/file_path_watcher.h"
#include "base/files/file_path_watcher_kqueue.h"
+#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#if !defined(OS_IOS)
@@ -16,6 +19,8 @@ namespace {
class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
public:
+ ~FilePathWatcherImpl() override = default;
+
bool Watch(const FilePath& path,
bool recursive,
const FilePathWatcher::Callback& callback) override {
@@ -25,10 +30,10 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
if (!FilePathWatcher::RecursiveWatchAvailable())
return false;
#if !defined(OS_IOS)
- impl_ = new FilePathWatcherFSEvents();
+ impl_ = MakeUnique<FilePathWatcherFSEvents>();
#endif // OS_IOS
} else {
- impl_ = new FilePathWatcherKQueue();
+ impl_ = MakeUnique<FilePathWatcherKQueue>();
}
DCHECK(impl_.get());
return impl_->Watch(path, recursive, callback);
@@ -40,17 +45,15 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
set_cancelled();
}
- protected:
- ~FilePathWatcherImpl() override {}
-
- scoped_refptr<PlatformDelegate> impl_;
+ private:
+ std::unique_ptr<PlatformDelegate> impl_;
};
} // namespace
FilePathWatcher::FilePathWatcher() {
sequence_checker_.DetachFromSequence();
- impl_ = new FilePathWatcherImpl();
+ impl_ = MakeUnique<FilePathWatcherImpl>();
}
} // namespace base

Powered by Google App Engine
This is Rietveld 408576698