diff options
| author | sergeyu <sergeyu@chromium.org> | 2014-09-29 12:38:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 19:38:43 +0000 |
| commit | afce97826070950bca497ce147a30312ce780e74 (patch) | |
| tree | 5d9741c3c98c97427665687d83561d709a2ca222 /remoting/protocol/content_description.cc | |
| parent | 7461dcda6673ccd78b82efc4719e1389fc0c215b (diff) | |
| download | chromium_src-afce97826070950bca497ce147a30312ce780e74.zip chromium_src-afce97826070950bca497ce147a30312ce780e74.tar.gz chromium_src-afce97826070950bca497ce147a30312ce780e74.tar.bz2 | |
Cleanup usage of scoped_ptr<> in remoting for C++11
- Use nullptr to initialize null scoped_ptr().
- use Pass(), PassAs() is no longer required.
Review URL: https://codereview.chromium.org/609923004
Cr-Commit-Position: refs/heads/master@{#297236}
Diffstat (limited to 'remoting/protocol/content_description.cc')
| -rw-r--r-- | remoting/protocol/content_description.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc index 3c04c4a..ef9dca1 100644 --- a/remoting/protocol/content_description.cc +++ b/remoting/protocol/content_description.cc @@ -214,7 +214,7 @@ scoped_ptr<ContentDescription> ContentDescription::ParseXml( const XmlElement* element) { if (element->Name() != QName(kChromotingXmlNamespace, kDescriptionTag)) { LOG(ERROR) << "Invalid description: " << element->Str(); - return scoped_ptr<ContentDescription>(); + return nullptr; } scoped_ptr<CandidateSessionConfig> config( CandidateSessionConfig::CreateEmpty()); @@ -226,7 +226,7 @@ scoped_ptr<ContentDescription> ContentDescription::ParseXml( config->mutable_video_configs()) || !ParseChannelConfigs(element, kAudioTag, true, true, config->mutable_audio_configs())) { - return scoped_ptr<ContentDescription>(); + return nullptr; } scoped_ptr<XmlElement> authenticator_message; |