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 |