Part 2: Plumb render view ID to content::MediaObserver

chrome/browser/media/media_internals.h

Index: chrome/browser/media/media_internals.h
diff --git a/chrome/browser/media/media_internals.h b/chrome/browser/media/media_internals.h
index 1edd86a1e592c197a3ebb75d0c27792cb00e068f..f449a2bb8ae0ac97a7472f93019e292dcacf80f0 100644
--- a/chrome/browser/media/media_internals.h
+++ b/chrome/browser/media/media_internals.h
@@ -28,14 +28,19 @@ class MediaInternals : public content::MediaObserver {
   static MediaInternals* GetInstance();
 
   // Overridden from content::MediaObserver:
-  virtual void OnDeleteAudioStream(void* host, int stream_id) OVERRIDE;
-  virtual void OnSetAudioStreamPlaying(void* host,
+  virtual void OnDeleteAudioStream(int render_process_id,
+                                   int render_view_id,
+                                   int stream_id) OVERRIDE;
+  virtual void OnSetAudioStreamPlaying(int render_process_id,
+                                       int render_view_id,
                                        int stream_id,
                                        bool playing) OVERRIDE;
-  virtual void OnSetAudioStreamStatus(void* host,
+  virtual void OnSetAudioStreamStatus(int render_process_id,
+                                      int render_view_id,
                                       int stream_id,
                                       const std::string& status) OVERRIDE;
-  virtual void OnSetAudioStreamVolume(void* host,
+  virtual void OnSetAudioStreamVolume(int render_process_id,
+                                      int render_view_id,
                                       int stream_id,
                                       double volume) OVERRIDE;
   virtual void OnMediaEvent(int render_process_id,
@@ -63,9 +68,10 @@ class MediaInternals : public content::MediaObserver {
   MediaInternals();
 
   // Sets |property| of an audio stream to |value| and notifies observers.
-  // (host, stream_id) is a unique id for the audio stream.
-  // |host| will never be dereferenced.
-  void UpdateAudioStream(void* host, int stream_id,
+  // (render_process_id, render_view_id, stream_id) is a unique id for the
+  // audio stream.
+  void UpdateAudioStream(int render_process_id, int render_view_id,
+                         int stream_id,
                          const std::string& property, Value* value);
 
   // Removes |item| from |data_|.
@@ -73,8 +79,10 @@ class MediaInternals : public content::MediaObserver {
 
   // Sets data_.id.property = value and notifies attached UIs using update_fn.
   // id may be any depth, e.g. "video.decoders.1.2.3"
-  void UpdateItem(const std::string& update_fn, const std::string& id,
-                  const std::string& property, Value* value);
+  void UpdateItem(const std::string& update_fn,
+                  int render_process_id, int render_view_id,
+                  const std::string& id, const std::string& property,
+                  Value* value);
 
   // Calls javascript |function|(|value|) on each attached UI.
   void SendUpdate(const std::string& function, Value* value);