Index: remoting/host/client_session.cc |
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc |
index feb581d19798ad73bff660175a68f864b138be7d..8d45b8fb0d32216d35f05714543440dbc00538ad 100644 |
--- a/remoting/host/client_session.cc |
+++ b/remoting/host/client_session.cc |
@@ -494,15 +494,15 @@ scoped_ptr<VideoEncoder> ClientSession::CreateVideoEncoder( |
const protocol::ChannelConfig& video_config = config.video_config(); |
if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) { |
- return remoting::VideoEncoderVpx::CreateForVP8().PassAs<VideoEncoder>(); |
+ return remoting::VideoEncoderVpx::CreateForVP8().Pass(); |
} else if (video_config.codec == protocol::ChannelConfig::CODEC_VP9) { |
- return remoting::VideoEncoderVpx::CreateForVP9().PassAs<VideoEncoder>(); |
+ return remoting::VideoEncoderVpx::CreateForVP9().Pass(); |
} else if (video_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { |
- return scoped_ptr<VideoEncoder>(new remoting::VideoEncoderVerbatim()); |
+ return make_scoped_ptr(new remoting::VideoEncoderVerbatim()); |
rmsousa
2014/09/27 01:49:20
Isn't this returning a different scoped_ptr type (
Sergey Ulanov
2014/09/29 17:33:24
Yes, upcast is automatic now (that's why PassAs()
|
} |
NOTREACHED(); |
- return scoped_ptr<VideoEncoder>(); |
+ return nullptr; |
} |
// static |
@@ -517,7 +517,7 @@ scoped_ptr<AudioEncoder> ClientSession::CreateAudioEncoder( |
} |
NOTREACHED(); |
- return scoped_ptr<AudioEncoder>(); |
+ return nullptr; |
} |
} // namespace remoting |