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

content/browser/renderer_host/media/mock_media_observer.h

Index: content/browser/renderer_host/media/mock_media_observer.h
diff --git a/content/browser/renderer_host/media/mock_media_observer.h b/content/browser/renderer_host/media/mock_media_observer.h
index 8d8a9c694a28984119fb59dec94388945bc16e32..9f65f11b29b604871f4e13c7c8375660587cab51 100644
--- a/content/browser/renderer_host/media/mock_media_observer.h
+++ b/content/browser/renderer_host/media/mock_media_observer.h
@@ -17,14 +17,17 @@ class MockMediaObserver : public content::MediaObserver {
   MockMediaObserver();
   virtual ~MockMediaObserver();
 
-  MOCK_METHOD2(OnDeleteAudioStream,
-               void(void* host, int stream_id));
-  MOCK_METHOD3(OnSetAudioStreamPlaying,
-               void(void* host, int stream_id, bool playing));
-  MOCK_METHOD3(OnSetAudioStreamStatus,
-               void(void* host, int stream_id, const std::string& status));
-  MOCK_METHOD3(OnSetAudioStreamVolume,
-               void(void* host, int stream_id, double volume));
+  MOCK_METHOD3(OnDeleteAudioStream,
+               void(int render_process_id, int render_view_id, int stream_id));
+  MOCK_METHOD4(OnSetAudioStreamPlaying,
+               void(int render_process_id, int render_view_id,
+                    int stream_id, bool playing));
+  MOCK_METHOD4(OnSetAudioStreamStatus,
+               void(int render_process_id, int render_view_id,
+                    int stream_id, const std::string& status));
+  MOCK_METHOD4(OnSetAudioStreamVolume,
+               void(int render_process_id, int render_view_id,
+                    int stream_id, double volume));
   MOCK_METHOD2(OnMediaEvent,
                void(int source, const media::MediaLogEvent& event));
   MOCK_METHOD3(OnCaptureDevicesOpened,