| Index: remoting/protocol/content_description.cc
|
| diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc
|
| index f50f46bf663d285d45427d72679a70303a0512ef..f4bd66407e0dd5cfb3e8a4062a694af0bea587f5 100644
|
| --- a/remoting/protocol/content_description.cc
|
| +++ b/remoting/protocol/content_description.cc
|
| @@ -115,8 +115,8 @@ bool ParseChannelConfig(const XmlElement* element, bool codec_required,
|
| ContentDescription::ContentDescription(
|
| scoped_ptr<CandidateSessionConfig> config,
|
| scoped_ptr<buzz::XmlElement> authenticator_message)
|
| - : candidate_config_(config.Pass()),
|
| - authenticator_message_(authenticator_message.Pass()) {
|
| + : candidate_config_(std::move(config)),
|
| + authenticator_message_(std::move(authenticator_message)) {
|
| }
|
|
|
| ContentDescription::~ContentDescription() { }
|
| @@ -235,8 +235,8 @@ scoped_ptr<ContentDescription> ContentDescription::ParseXml(
|
| if (child)
|
| authenticator_message.reset(new XmlElement(*child));
|
|
|
| - return make_scoped_ptr(
|
| - new ContentDescription(config.Pass(), authenticator_message.Pass()));
|
| + return make_scoped_ptr(new ContentDescription(
|
| + std::move(config), std::move(authenticator_message)));
|
| }
|
|
|
| } // namespace protocol
|
|
|