| Index: remoting/host/remoting_me2me_host.cc
|
| diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
|
| index 6291e4189f4a112a7b726b00a09c22cdfd7a3bb6..1b55aaa025ebb26258287651b6d0e64d3fc98598 100644
|
| --- a/remoting/host/remoting_me2me_host.cc
|
| +++ b/remoting/host/remoting_me2me_host.cc
|
| @@ -380,7 +380,7 @@ void HostProcess::SigTermHandler(int signal_number) {
|
| void HostProcess::CreateAuthenticatorFactory() {
|
| DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
|
| - if (!host_ || shutting_down_)
|
| + if (!host_.get() || shutting_down_)
|
| return;
|
|
|
| std::string local_certificate = key_pair_.GenerateCertificate();
|
| @@ -600,7 +600,7 @@ void HostProcess::OnPolicyUpdate(scoped_ptr<base::DictionaryValue> policies) {
|
| &bool_value)) {
|
| restart_required |= OnCurtainPolicyUpdate(bool_value);
|
| }
|
| - if (!host_) {
|
| + if (!host_.get()) {
|
| StartHost();
|
| } else if (restart_required) {
|
| RestartHost();
|
| @@ -672,7 +672,7 @@ bool HostProcess::OnHostTalkGadgetPrefixPolicyUpdate(
|
|
|
| void HostProcess::StartHost() {
|
| DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
| - DCHECK(!host_);
|
| + DCHECK(!host_.get());
|
| DCHECK(!signal_strategy_.get());
|
|
|
| if (shutting_down_)
|
| @@ -727,15 +727,16 @@ void HostProcess::StartHost() {
|
| this, host_id_, signal_strategy_.get(), &key_pair_));
|
|
|
| log_to_server_.reset(
|
| - new LogToServer(host_, ServerLogEntry::ME2ME, signal_strategy_.get()));
|
| - host_event_logger_ = HostEventLogger::Create(host_, kApplicationName);
|
| + new LogToServer(
|
| + host_.get(), ServerLogEntry::ME2ME, signal_strategy_.get()));
|
| + host_event_logger_ = HostEventLogger::Create(host_.get(), kApplicationName);
|
|
|
| #if defined(OS_LINUX)
|
| // Desktop resizing is implemented on all three platforms, but may not be
|
| // the right thing to do for non-virtual desktops. Disable it until we can
|
| // implement a configuration UI.
|
| resizing_host_observer_.reset(
|
| - new ResizingHostObserver(desktop_resizer_.get(), host_));
|
| + new ResizingHostObserver(desktop_resizer_.get(), host_.get()));
|
| #endif
|
|
|
| // Curtain mode is currently broken on Mac (the only supported platform),
|
| @@ -745,8 +746,8 @@ void HostProcess::StartHost() {
|
|
|
| if (host_user_interface_.get()) {
|
| host_user_interface_->Start(
|
| - host_, base::Bind(&HostProcess::OnDisconnectRequested,
|
| - base::Unretained(this)));
|
| + host_.get(), base::Bind(&HostProcess::OnDisconnectRequested,
|
| + base::Unretained(this)));
|
| }
|
|
|
| host_->Start(xmpp_login_);
|
| @@ -772,7 +773,7 @@ void HostProcess::OnDisconnectRequested() {
|
| &HostProcess::OnDisconnectRequested, base::Unretained(this)));
|
| return;
|
| }
|
| - if (host_) {
|
| + if (host_.get()) {
|
| host_->DisconnectAllClients();
|
| }
|
| }
|
| @@ -809,7 +810,7 @@ void HostProcess::Shutdown(int exit_code) {
|
|
|
| shutting_down_ = true;
|
| exit_code_ = exit_code;
|
| - if (host_) {
|
| + if (host_.get()) {
|
| host_->Shutdown(base::Bind(
|
| &HostProcess::OnShutdownFinished, base::Unretained(this)));
|
| } else {
|
|
|