Cleanup usage of scoped_ptr<> in remoting for C++11

remoting/host/me2me_desktop_environment.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/me2me_desktop_environment.h"
 
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "remoting/base/logging.h"
 #include "remoting/host/client_session_control.h"
@@ skipping 47 matching lines @@
 
 scoped_ptr<GnubbyAuthHandler> Me2MeDesktopEnvironment::CreateGnubbyAuthHandler(
     protocol::ClientStub* client_stub) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   if (gnubby_auth_enabled_)
     return scoped_ptr<GnubbyAuthHandler>(
         GnubbyAuthHandler::Create(client_stub));
 
   HOST_LOG << "gnubby auth is not enabled";
-  return scoped_ptr<GnubbyAuthHandler>();
+  return nullptr;
 }
 
 bool Me2MeDesktopEnvironment::InitializeSecurity(
     base::WeakPtr<ClientSessionControl> client_session_control,
     bool curtain_enabled) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   // Detach the session from the local console if the caller requested.
   if (curtain_enabled) {
     curtain_ = CurtainMode::Create(caller_task_runner(),
@@ skipping 62 matching lines @@
 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
     base::WeakPtr<ClientSessionControl> client_session_control) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   scoped_ptr<Me2MeDesktopEnvironment> desktop_environment(
       new Me2MeDesktopEnvironment(caller_task_runner(),
                                   input_task_runner(),
                                   ui_task_runner()));
   if (!desktop_environment->InitializeSecurity(client_session_control,
                                                curtain_enabled_)) {
-    return scoped_ptr<DesktopEnvironment>();
+    return nullptr;
   }
   desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_);
 
-  return desktop_environment.PassAs<DesktopEnvironment>();
+  return desktop_environment.Pass();
 }
 
 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   curtain_enabled_ = enable;
 }
 
 void Me2MeDesktopEnvironmentFactory::SetEnableGnubbyAuth(
     bool gnubby_auth_enabled) {
   gnubby_auth_enabled_ = gnubby_auth_enabled;
 }
 
 }  // namespace remoting