Enable audio/video tag in content_shell

content/browser/renderer_host/media/audio_renderer_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/audio_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ skipping 273 matching lines @@
 
   if (!entry->controller) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // If we have created the controller successfully create a entry and add it
   // to the map.
   entry->stream_id = stream_id;
   audio_entries_.insert(std::make_pair(stream_id, entry.release()));
-  media_observer()->OnSetAudioStreamStatus(this, stream_id, "created");
+  OnSetAudioStreamStatus(stream_id, "created");
 }
 
 void AudioRendererHost::OnPlayStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Play();
-  media_observer()->OnSetAudioStreamPlaying(this, stream_id, true);
+  OnSetAudioStreamPlaying(stream_id, true);
 }
 
 void AudioRendererHost::OnPauseStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Pause();
-  media_observer()->OnSetAudioStreamPlaying(this, stream_id, false);
+  OnSetAudioStreamPlaying(stream_id, false);
 }
 
 void AudioRendererHost::OnFlushStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Flush();
-  media_observer()->OnSetAudioStreamStatus(this, stream_id, "flushed");
+  OnSetAudioStreamStatus(stream_id, "flushed");
 }
 
 void AudioRendererHost::OnCloseStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  media_observer()->OnSetAudioStreamStatus(this, stream_id, "closed");
+  OnSetAudioStreamStatus(stream_id, "closed");
 
   AudioEntry* entry = LookupById(stream_id);
 
   if (entry)
     CloseAndDeleteStream(entry);
 }
 
 void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // Make sure the volume is valid.
   if (volume < 0 || volume > 1.0)
     return;
   entry->controller->SetVolume(volume);
-  media_observer()->OnSetAudioStreamVolume(this, stream_id, volume);
+  OnSetAudioStreamVolume(stream_id, volume);
 }
 
 void AudioRendererHost::OnGetVolume(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   NOTREACHED() << "This message shouldn't be received";
 }
 
 void AudioRendererHost::OnNotifyPacketReady(int stream_id, uint32 packet_size) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ skipping 51 matching lines @@
 void AudioRendererHost::DeleteEntry(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Delete the entry when this method goes out of scope.
   scoped_ptr<AudioEntry> entry_deleter(entry);
 
   // Erase the entry identified by |stream_id| from the map.
   audio_entries_.erase(entry->stream_id);
 
   // Notify the media observer.
-  media_observer()->OnDeleteAudioStream(this, entry->stream_id);
+  OnDeleteAudioStream(entry->stream_id);
 }
 
 void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Sends the error message first before we close the stream because
   // |entry| is destroyed in DeleteEntry().
   SendErrorMessage(entry->stream_id);
 
-  media_observer()->OnSetAudioStreamStatus(this, entry->stream_id, "error");
+  OnSetAudioStreamStatus(entry->stream_id, "error");
   CloseAndDeleteStream(entry);
 }
 
 AudioRendererHost::AudioEntry* AudioRendererHost::LookupById(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntryMap::iterator i = audio_entries_.find(stream_id);
   if (i != audio_entries_.end() && !i->second->pending_close)
     return i->second;
   return NULL;
 }
 
 AudioRendererHost::AudioEntry* AudioRendererHost::LookupByController(
     media::AudioOutputController* controller) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // 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) {
     if (!i->second->pending_close && controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
 }
 
+void AudioRendererHost::OnSetAudioStreamPlaying(int stream_id, bool playing) {
+  if (!media_observer())
+    return;
+  media_observer()->OnSetAudioStreamPlaying(this, stream_id, playing);
+}
+
+void AudioRendererHost::OnSetAudioStreamStatus(int stream_id,
+                                               const std::string& status) {
+  if (!media_observer())
+    return;
+  media_observer()->OnSetAudioStreamStatus(this, stream_id, status);
+}
+
+void AudioRendererHost::OnSetAudioStreamVolume(int stream_id, double volume) {
+  if (!media_observer())
+    return;
+  media_observer()->OnSetAudioStreamVolume(this, stream_id, volume);
+}
+
+void AudioRendererHost::OnDeleteAudioStream(int stream_id) {
+  if (!media_observer())
+    return;
+  media_observer()->OnDeleteAudioStream(this, stream_id);
+}
+
 MediaObserver* AudioRendererHost::media_observer() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!media_observer_)
     media_observer_ = resource_context_->media_observer();
   return media_observer_;

[scherkus (not reviewing), 2012/02/03 23:40:01]

I forget why this was coded like this but I wonder whether it's worth having
this member variable at all -- seems like a good source of potential bugs in the
future!

WDYT?

[vrk (LEFT CHROMIUM), 2012/03/06 02:07:50]

(as discussed offline) You're right it should be removed, but it's a little
risky to do so right now. Since it's not high-priority, let's wait till M20. I
created crbug.com/116906 and commented in the header file.

 }