Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(471)

Unified Diff: remoting/protocol/content_description.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/protocol/content_description.cc
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc
index 3c04c4a7a2d656e26b9dc0dbbf984e7d2acfb981..ef9dca14d66c623d112efb57b854452478b07d3e 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;

Powered by Google App Engine
This is Rietveld 408576698