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

Unified Diff: remoting/host/linux/certificate_watcher.h

Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months 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: remoting/host/linux/certificate_watcher.h
diff --git a/remoting/host/linux/certificate_watcher.h b/remoting/host/linux/certificate_watcher.h
index 5d99139b08d8f9deff3566bbb0fc3653f7dea2f4..5dee61d3cff6d6e6f1274751e996d94c36228613 100644
--- a/remoting/host/linux/certificate_watcher.h
+++ b/remoting/host/linux/certificate_watcher.h
@@ -5,10 +5,11 @@
#ifndef REMOTING_HOST_LINUX_CERTIFICATE_WATCHER_H_
#define REMOTING_HOST_LINUX_CERTIFICATE_WATCHER_H_
+#include <memory>
+
#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
#include "remoting/host/host_status_monitor.h"
@@ -91,13 +92,13 @@ class CertificateWatcher : public remoting::HostStatusObserver {
base::FilePath cert_watch_path_;
// The file watcher to watch changes inside the certificate folder.
- scoped_ptr<base::FilePathWatcher> file_watcher_;
+ std::unique_ptr<base::FilePathWatcher> file_watcher_;
// The time to wait to restart when it is scheduled.
base::TimeDelta delay_;
// Timer to delay the restart action.
- scoped_ptr<base::DelayTimer> restart_timer_;
+ std::unique_ptr<base::DelayTimer> restart_timer_;
base::WeakPtrFactory<CertificateWatcher> weak_factory_;
« no previous file with comments | « ios/web/net/crw_cert_verification_controller.mm ('k') | remoting/host/linux/certificate_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698