| Index: chrome/browser/media_galleries/gallery_watch_manager.cc
|
| diff --git a/chrome/browser/media_galleries/gallery_watch_manager.cc b/chrome/browser/media_galleries/gallery_watch_manager.cc
|
| index de4ece789194aa4a579a906a8ffc16773508ddfd..1714176a4e5dcec1adf558600e89a219252f9d40 100644
|
| --- a/chrome/browser/media_galleries/gallery_watch_manager.cc
|
| +++ b/chrome/browser/media_galleries/gallery_watch_manager.cc
|
| @@ -111,8 +111,8 @@ void GalleryWatchManager::FileWatchManager::AddFileWatch(
|
| // This can occur if the GalleryWatchManager attempts to watch the same path
|
| // again before recieving the callback. It's benign.
|
| if (base::ContainsKey(watchers_, path)) {
|
| - BrowserThread::PostTask(
|
| - BrowserThread::UI, FROM_HERE, base::Bind(callback, false));
|
| + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| + base::BindOnce(callback, false));
|
| return;
|
| }
|
|
|
| @@ -125,8 +125,8 @@ void GalleryWatchManager::FileWatchManager::AddFileWatch(
|
| if (success)
|
| watchers_[path] = watcher;
|
|
|
| - BrowserThread::PostTask(
|
| - BrowserThread::UI, FROM_HERE, base::Bind(callback, success));
|
| + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| + base::BindOnce(callback, success));
|
| }
|
|
|
| void GalleryWatchManager::FileWatchManager::RemoveFileWatch(
|
| @@ -147,8 +147,8 @@ void GalleryWatchManager::FileWatchManager::OnFilePathChanged(
|
| DCHECK_CURRENTLY_ON(BrowserThread::FILE);
|
| if (error)
|
| RemoveFileWatch(path);
|
| - BrowserThread::PostTask(
|
| - BrowserThread::UI, FROM_HERE, base::Bind(callback_, path, error));
|
| + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| + base::BindOnce(callback_, path, error));
|
| }
|
|
|
| GalleryWatchManager::WatchOwner::WatchOwner(BrowserContext* browser_context,
|
| @@ -290,12 +290,10 @@ void GalleryWatchManager::AddWatch(BrowserContext* browser_context,
|
| owner,
|
| path,
|
| callback);
|
| - BrowserThread::PostTask(BrowserThread::FILE,
|
| - FROM_HERE,
|
| - base::Bind(&FileWatchManager::AddFileWatch,
|
| - watch_manager_->GetWeakPtr(),
|
| - path,
|
| - on_watch_added));
|
| + BrowserThread::PostTask(
|
| + BrowserThread::FILE, FROM_HERE,
|
| + base::BindOnce(&FileWatchManager::AddFileWatch,
|
| + watch_manager_->GetWeakPtr(), path, on_watch_added));
|
| }
|
| }
|
|
|
| @@ -369,11 +367,9 @@ void GalleryWatchManager::DeactivateFileWatch(const WatchOwner& owner,
|
| it->second.owners.erase(owner);
|
| if (it->second.owners.empty()) {
|
| watched_paths_.erase(it);
|
| - BrowserThread::PostTask(BrowserThread::FILE,
|
| - FROM_HERE,
|
| - base::Bind(&FileWatchManager::RemoveFileWatch,
|
| - watch_manager_->GetWeakPtr(),
|
| - path));
|
| + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
|
| + base::BindOnce(&FileWatchManager::RemoveFileWatch,
|
| + watch_manager_->GetWeakPtr(), path));
|
| }
|
| }
|
|
|
| @@ -425,12 +421,9 @@ void GalleryWatchManager::OnFilePathChanged(const base::FilePath& path,
|
| base::TimeDelta::FromSeconds(kMinNotificationDelayInSeconds) -
|
| base::Time::Now();
|
| BrowserThread::PostDelayedTask(
|
| - BrowserThread::UI,
|
| - FROM_HERE,
|
| - base::Bind(&GalleryWatchManager::OnFilePathChanged,
|
| - weak_factory_.GetWeakPtr(),
|
| - path,
|
| - error),
|
| + BrowserThread::UI, FROM_HERE,
|
| + base::BindOnce(&GalleryWatchManager::OnFilePathChanged,
|
| + weak_factory_.GetWeakPtr(), path, error),
|
| delay_to_next_valid_time);
|
| }
|
| return;
|
|
|