diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-12-22 15:26:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-22 23:27:37 +0000 |
| commit | aa6fa234d0649238dfddf6eb7aa80d0ddc71e66f (patch) | |
| tree | d26a4e039ef85bc0ab778fd4392b4247ab0aa56b /remoting/protocol/content_description.cc | |
| parent | 090adf5b5c636b630d09d124d73d73e494505c3f (diff) | |
| download | chromium_src-aa6fa234d0649238dfddf6eb7aa80d0ddc71e66f.zip chromium_src-aa6fa234d0649238dfddf6eb7aa80d0ddc71e66f.tar.gz chromium_src-aa6fa234d0649238dfddf6eb7aa80d0ddc71e66f.tar.bz2 | |
Use std::move() instead of scoped_ptr<>::Pass() in remoting/protocol
Now there is a presubmit check that doesn't allow Pass() anymore.
See https://www.chromium.org/rvalue-references for information
about std::move in chromium.
Review URL: https://codereview.chromium.org/1534193004
Cr-Commit-Position: refs/heads/master@{#366687}
Diffstat (limited to 'remoting/protocol/content_description.cc')
| -rw-r--r-- | remoting/protocol/content_description.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc index f50f46b..f4bd664 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 |