Index: remoting/host/clipboard_mac.mm |
diff --git a/remoting/host/clipboard_mac.mm b/remoting/host/clipboard_mac.mm |
index 758f39b8949dc4c43c78fc6eba0026484df73358..d361a648513c82511ef12e300484db1e3c5918e8 100644 |
--- a/remoting/host/clipboard_mac.mm |
+++ b/remoting/host/clipboard_mac.mm |
@@ -7,9 +7,11 @@ |
#import <Cocoa/Cocoa.h> |
#include <stdint.h> |
+#include <memory> |
+ |
#include "base/logging.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/sys_string_conversions.h" |
#include "base/timer/timer.h" |
#include "remoting/base/constants.h" |
@@ -31,14 +33,15 @@ class ClipboardMac : public Clipboard { |
ClipboardMac(); |
~ClipboardMac() override; |
- void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override; |
+ void Start( |
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) override; |
void InjectClipboardEvent(const protocol::ClipboardEvent& event) override; |
private: |
void CheckClipboardForChanges(); |
- scoped_ptr<protocol::ClipboardStub> client_clipboard_; |
- scoped_ptr<base::RepeatingTimer> clipboard_polling_timer_; |
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard_; |
+ std::unique_ptr<base::RepeatingTimer> clipboard_polling_timer_; |
NSInteger current_change_count_; |
DISALLOW_COPY_AND_ASSIGN(ClipboardMac); |
@@ -48,7 +51,8 @@ ClipboardMac::ClipboardMac() : current_change_count_(0) {} |
ClipboardMac::~ClipboardMac() {} |
-void ClipboardMac::Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) { |
+void ClipboardMac::Start( |
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) { |
client_clipboard_.reset(client_clipboard.release()); |
// Synchronize local change-count with the pasteboard's. The change-count is |
@@ -103,8 +107,8 @@ void ClipboardMac::CheckClipboardForChanges() { |
client_clipboard_->InjectClipboardEvent(event); |
} |
-scoped_ptr<Clipboard> Clipboard::Create() { |
- return make_scoped_ptr(new ClipboardMac()); |
+std::unique_ptr<Clipboard> Clipboard::Create() { |
+ return base::WrapUnique(new ClipboardMac()); |
} |
} // namespace remoting |