| Index: remoting/host/chromeos/clipboard_aura.cc
|
| diff --git a/remoting/host/chromeos/clipboard_aura.cc b/remoting/host/chromeos/clipboard_aura.cc
|
| index ef0438b96838ccc77a2e41814e618fa29ab3979c..02b593b05fc75bd5de01d0e5bf50dd33b0982209 100644
|
| --- a/remoting/host/chromeos/clipboard_aura.cc
|
| +++ b/remoting/host/chromeos/clipboard_aura.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <utility>
|
|
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "remoting/base/constants.h"
|
| #include "remoting/proto/event.pb.h"
|
| @@ -32,7 +33,7 @@ ClipboardAura::~ClipboardAura() {
|
| }
|
|
|
| void ClipboardAura::Start(
|
| - scoped_ptr<protocol::ClipboardStub> client_clipboard) {
|
| + std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| client_clipboard_ = std::move(client_clipboard);
|
| @@ -90,8 +91,8 @@ void ClipboardAura::CheckClipboardForChanges() {
|
| client_clipboard_->InjectClipboardEvent(event);
|
| }
|
|
|
| -scoped_ptr<Clipboard> Clipboard::Create() {
|
| - return make_scoped_ptr(new ClipboardAura());
|
| +std::unique_ptr<Clipboard> Clipboard::Create() {
|
| + return base::WrapUnique(new ClipboardAura());
|
| }
|
|
|
| } // namespace remoting
|
|
|