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

Unified Diff: remoting/client/chromoting_client.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU 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
« no previous file with comments | « remoting/client/chromoting_client.h ('k') | remoting/client/chromoting_client_runtime.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/chromoting_client.cc
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index e51bc7b8046e550e7494cad51ec371b14850a0ea..35aa71ec9fe792d69370c832dce81c0aaee20211 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/memory/ptr_util.h"
#include "remoting/base/capabilities.h"
#include "remoting/base/constants.h"
#include "remoting/client/audio_decode_scheduler.h"
@@ -30,7 +31,7 @@ namespace remoting {
ChromotingClient::ChromotingClient(ClientContext* client_context,
ClientUserInterface* user_interface,
protocol::VideoRenderer* video_renderer,
- scoped_ptr<AudioPlayer> audio_player)
+ std::unique_ptr<AudioPlayer> audio_player)
: user_interface_(user_interface), video_renderer_(video_renderer) {
DCHECK(client_context->main_task_runner()->BelongsToCurrentThread());
if (audio_player) {
@@ -46,12 +47,12 @@ ChromotingClient::~ChromotingClient() {
}
void ChromotingClient::set_protocol_config(
- scoped_ptr<protocol::CandidateSessionConfig> config) {
+ std::unique_ptr<protocol::CandidateSessionConfig> config) {
protocol_config_ = std::move(config);
}
void ChromotingClient::SetConnectionToHostForTests(
- scoped_ptr<protocol::ConnectionToHost> connection_to_host) {
+ std::unique_ptr<protocol::ConnectionToHost> connection_to_host) {
connection_ = std::move(connection_to_host);
}
@@ -239,7 +240,7 @@ void ChromotingClient::StartConnection() {
connection_->Connect(
session_manager_->Connect(
host_jid_,
- make_scoped_ptr(new protocol::NegotiatingClientAuthenticator(
+ base::WrapUnique(new protocol::NegotiatingClientAuthenticator(
NormalizeJid(signal_strategy_->GetLocalJid()), host_jid_,
client_auth_config_))),
transport_context_, this);
« no previous file with comments | « remoting/client/chromoting_client.h ('k') | remoting/client/chromoting_client_runtime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698