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

Unified Diff: components/copresence/handlers/audio/audio_directive_list.cc

Issue 691223002: Replacing NULL with nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using EXPECT_THAT Created 6 years, 2 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
« no previous file with comments | « no previous file | components/copresence/handlers/audio/audio_directive_list_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/copresence/handlers/audio/audio_directive_list.cc
diff --git a/components/copresence/handlers/audio/audio_directive_list.cc b/components/copresence/handlers/audio/audio_directive_list.cc
index 2060ef51048316ebcf4fa41a773c87b88096c702..5434c60b4ea0185df238cda87d4bc94cfdc15e0a 100644
--- a/components/copresence/handlers/audio/audio_directive_list.cc
+++ b/components/copresence/handlers/audio/audio_directive_list.cc
@@ -72,7 +72,7 @@ scoped_ptr<AudioDirective> AudioDirectiveList::GetActiveDirective() {
}
if (active_directives_.empty())
- return make_scoped_ptr<AudioDirective>(NULL);
+ return scoped_ptr<AudioDirective>().Pass();
return make_scoped_ptr(new AudioDirective(active_directives_.front()));
}
« no previous file with comments | « no previous file | components/copresence/handlers/audio/audio_directive_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698