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

Unified Diff: chrome/browser/media_galleries/fileapi/file_path_watcher_util.cc

Issue 2438913003: Require FilePathWatcher destructor to be called in sequence with Watch(). (Closed)
Patch Set: CR thestig #36 (fix comment) Created 4 years, 1 month 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: chrome/browser/media_galleries/fileapi/file_path_watcher_util.cc
diff --git a/chrome/browser/media_galleries/fileapi/file_path_watcher_util.cc b/chrome/browser/media_galleries/fileapi/file_path_watcher_util.cc
index 129cbac2d16058cb095745103d25cfa13e7188c5..16295c999a16981a1e4be8aea330e3473538a13e 100644
--- a/chrome/browser/media_galleries/fileapi/file_path_watcher_util.cc
+++ b/chrome/browser/media_galleries/fileapi/file_path_watcher_util.cc
@@ -58,3 +58,15 @@ void StartFilePathWatchOnMediaTaskRunner(
watch_started_callback,
path_changed_callback));
}
+
+void StopFilePathWatchOnMediaTaskRunner(
+ std::unique_ptr<base::FilePathWatcher> watcher) {
+ MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
+ if (watcher) {
+ const bool task_posted = content::BrowserThread::DeleteSoon(
+ content::BrowserThread::FILE, FROM_HERE, watcher.release());
+
+ // This will fail if the FILE thread has been stopped.
+ DCHECK(task_posted);
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698