[FilePathWatcher] Remove the deprecated Watch(bool) overload.

Also remove the casting that was introduced in https://crrev.com/830328, as it is no longer necessary. BUG=1147071 Change-Id: Id41ef7ae9c8aff4f74c7e67e0024af651de0e239 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2550676 Commit-Queue: Greg Thompson <grt@chromium.org> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Reviewed-by: Robert Kroeger <rjkroege@chromium.org> Reviewed-by: Joel Hockey <joelhockey@chromium.org> Reviewed-by: Mark Mentovai <mark@chromium.org> Cr-Commit-Position: refs/heads/master@{#832052}
FairyWorld · Nov 30, 2020 · d8f940d · d8f940d
1 parent 7bd5796
commit d8f940d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 25 deletions.
diff --git a/base/files/file_path_watcher.cc b/base/files/file_path_watcher.cc
@@ -43,11 +43,4 @@ bool FilePathWatcher::Watch(const FilePath& path,
   return impl_->Watch(path, type, callback);
 }
 
-bool FilePathWatcher::Watch(const FilePath& path,
-                            bool recursive,
-                            const Callback& callback) {
-  return Watch(path, recursive ? Type::kRecursive : Type::kNonRecursive,
-               callback);
-}
-
 }  // namespace base
diff --git a/base/files/file_path_watcher.h b/base/files/file_path_watcher.h
@@ -118,9 +118,6 @@ class BASE_EXPORT FilePathWatcher {
   // FileDescriptorWatcher.
   bool Watch(const FilePath& path, Type type, const Callback& callback);
 
-  // Compatibility function (deprecated) for the above.
-  bool Watch(const FilePath& path, bool recursive, const Callback& callback);
-
  private:
   std::unique_ptr<PlatformDelegate> impl_;
 

diff --git a/chrome/browser/chromeos/guest_os/guest_os_share_path.cc b/chrome/browser/chromeos/guest_os/guest_os_share_path.cc
@@ -671,11 +671,9 @@ void GuestOsSharePath::RegisterSharedPath(const std::string& vm_name,
   file_watcher_task_runner_->PostTask(
       FROM_HERE,
       base::BindOnce(
-          base::IgnoreResult(static_cast<bool (base::FilePathWatcher::*)(
-                                 const base::FilePath&, bool,
-                                 const base::FilePathWatcher::Callback&)>(
-              &base::FilePathWatcher::Watch)),
-          base::Unretained(watcher.get()), path, false,
+          base::IgnoreResult(&base::FilePathWatcher::Watch),
+          base::Unretained(watcher.get()), path,
+          base::FilePathWatcher::Type::kNonRecursive,
           base::BindRepeating(std::move(changed), std::move(deleted))));
   shared_paths_.emplace(path, SharedPathInfo(std::move(watcher), vm_name));
 }

diff --git a/chrome/browser/upgrade_detector/directory_monitor.cc b/chrome/browser/upgrade_detector/directory_monitor.cc
@@ -73,11 +73,8 @@ void DirectoryMonitor::Start(Callback on_change_callback) {
   task_runner_->PostTaskAndReplyWithResult(
       FROM_HERE,
       base::BindOnce(
-          static_cast<bool (base::FilePathWatcher::*)(
-              const base::FilePath&, base::FilePathWatcher::Type,
-              const base::FilePathWatcher::Callback&)>(
-              &base::FilePathWatcher::Watch),
-          base::Unretained(watcher_.get()), std::move(install_dir_), watch_type,
+          &base::FilePathWatcher::Watch, base::Unretained(watcher_.get()),
+          std::move(install_dir_), watch_type,
           base::BindRepeating(
               [](base::SequencedTaskRunner* main_sequence,
                  const Callback& on_change_callback, const base::FilePath&,

diff --git a/ui/events/ozone/device/device_manager_manual.cc b/ui/events/ozone/device/device_manager_manual.cc
@@ -68,11 +68,8 @@ void DeviceManagerManual::StartWatching() {
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(), FROM_HERE,
       base::BindOnce(
-          static_cast<bool (base::FilePathWatcher::*)(
-              const base::FilePath&, bool,
-              const base::FilePathWatcher::Callback&)>(
-              &base::FilePathWatcher::Watch),
-          base::Unretained(watcher_.get()), base::FilePath(kDevInput), false,
+          &base::FilePathWatcher::Watch, base::Unretained(watcher_.get()),
+          base::FilePath(kDevInput), base::FilePathWatcher::Type::kNonRecursive,
           base::BindRepeating(&DeviceManagerManual::OnWatcherEventOnUiSequence,
                               base::SequencedTaskRunnerHandle::Get(),
                               weak_ptr_factory_.GetWeakPtr())),