Part 1: Plumb render view ID to render host

content/renderer/pepper/pepper_platform_audio_output_impl.h

Index: content/renderer/pepper/pepper_platform_audio_output_impl.h
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.h b/content/renderer/pepper/pepper_platform_audio_output_impl.h
index 5fab0e4af4b3748aebc4d7feea7b259d5fd2f92b..ce70b0b06d4bf3d5cbd5f5da9073982b8df8b097 100644
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.h
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.h
@@ -10,6 +10,8 @@
 #include "media/audio/audio_output_ipc.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
+class AudioOutputIPCImpl;
+
 namespace media {
 class AudioParameters;
 }
@@ -28,6 +30,7 @@ class PepperPlatformAudioOutputImpl
   // Factory function, returns NULL on failure. StreamCreated() will be called
   // when the stream is created.
   static PepperPlatformAudioOutputImpl* Create(
+      int render_view_id,
       int sample_rate,
       int frames_per_buffer,
       webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client);
@@ -51,7 +54,7 @@ class PepperPlatformAudioOutputImpl
  private:
   friend class base::RefCountedThreadSafe<PepperPlatformAudioOutputImpl>;
 
-  PepperPlatformAudioOutputImpl();
+  PepperPlatformAudioOutputImpl(int render_view_id);
 
   bool Initialize(
       int sample_rate,
@@ -70,7 +73,7 @@ class PepperPlatformAudioOutputImpl
 
   // Used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE
   // I/O thread except to send messages and get the message loop.
-  media::AudioOutputIPC* ipc_;
+  scoped_ptr<AudioOutputIPCImpl> ipc_;
 
   // Our ID on the MessageFilter. THIS MUST ONLY BE ACCESSED ON THE I/O THREAD
   // or else you could race with the initialize function which sets it.