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

Unified Diff: content/browser/renderer_host/media/audio_renderer_host.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 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
Index: content/browser/renderer_host/media/audio_renderer_host.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index c043c2cb33317c31064f20ea215d70bfd5e4ad59..3531158c440988d8e8251fd46440ac14343ba999 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -268,7 +268,7 @@ void AudioRendererHost::OnCreateStream(
entry->controller = media::AudioOutputController::Create(
audio_manager_, this, audio_params, entry->reader.get());
- if (!entry->controller) {
+ if (!entry->controller.get()) {
SendErrorMessage(stream_id);
return;
}
@@ -361,7 +361,7 @@ void AudioRendererHost::DeleteEntries() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
for (AudioEntryMap::iterator i = audio_entries_.begin();
- i != audio_entries_.end(); ++i) {
+ i != audio_entries_.end(); ++i) {
CloseAndDeleteStream(i->second);
}
}
@@ -418,7 +418,7 @@ AudioRendererHost::AudioEntry* AudioRendererHost::LookupByController(
// Iterate the map of entries.
// TODO(hclam): Implement a faster look up method.
for (AudioEntryMap::iterator i = audio_entries_.begin();
- i != audio_entries_.end(); ++i) {
+ i != audio_entries_.end(); ++i) {
if (!i->second->pending_close && controller == i->second->controller.get())
return i->second;
}
@@ -428,7 +428,8 @@ AudioRendererHost::AudioEntry* AudioRendererHost::LookupByController(
media::AudioOutputController* AudioRendererHost::LookupControllerByIdForTesting(
int stream_id) {
AudioEntry* const entry = LookupById(stream_id);
- return entry ? entry->controller : NULL;
+ return .get()
+ return entry ? entry->controller : NULL;
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698