Plumb media data from renderers up to MediaInternals in the browser process.

BUG=none
TEST=manually


Review URL: http://codereview.chromium.org/7480032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95542 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 0 deletions

diff --git a/chrome/browser/media/DEPS b/chrome/browser/media/DEPS
new file mode 100644
index 0000000..cc5cd70
--- /dev/null
+++ b/chrome/browser/media/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+media/base",
+]
diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc
index bf63281..a563db3 100644
--- a/chrome/browser/media/media_internals.cc
+++ b/chrome/browser/media/media_internals.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/media/media_internals_observer.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/webui/web_ui.h"
+#include "media/base/media_log_event.h"
 
 // The names of the javascript functions to call with updates.
 static const char kDeleteItemFunction[] = "media.onItemDeleted";
@@ -46,6 +47,13 @@ void MediaInternals::OnSetAudioStreamVolume(
                     "volume", Value::CreateDoubleValue(volume));
 }
 
+void MediaInternals::OnMediaEvent(
+    int render_process_id, const media::MediaLogEvent& event) {
+  DCHECK(CalledOnValidThread());
+  // TODO(scottfr): Handle |event|. Record status information in data_ and pass
+  //                |event| along to observers.
+}
+
 void MediaInternals::AddObserver(MediaInternalsObserver* observer) {
   DCHECK(CalledOnValidThread());
   observers_.AddObserver(observer);
diff --git a/chrome/browser/media/media_internals.h b/chrome/browser/media/media_internals.h
index c0d276e..a5b62e1 100644
--- a/chrome/browser/media/media_internals.h
+++ b/chrome/browser/media/media_internals.h
@@ -14,6 +14,10 @@
 
 class MediaInternalsObserver;
 
+namespace media {
+struct MediaLogEvent;
+}
+
 // This class stores information about currently active media.
 // All of its methods are called on the IO thread.
 class MediaInternals : public MediaObserver, public base::NonThreadSafe {
@@ -26,6 +30,8 @@ class MediaInternals : public MediaObserver, public base::NonThreadSafe {
   virtual void OnSetAudioStreamStatus(void* host, int stream_id,
                                       const std::string& status);
   virtual void OnSetAudioStreamVolume(void* host, int stream_id, double volume);
+  virtual void OnMediaEvent(int render_process_id,
+                            const media::MediaLogEvent& event);
 
   // Methods for observers.
   // Observers should add themselves on construction and remove themselves