Part 1: Plumb render view ID to render host

media/audio/audio_output_device.h

Index: media/audio/audio_output_device.h
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h
index 0e70ceb46c5c2e4e4336db3db915ae3262f5813f..1b7231b09cf2b46ea833c6268a2e2c27c533d00b 100644
--- a/media/audio/audio_output_device.h
+++ b/media/audio/audio_output_device.h
@@ -95,9 +95,7 @@ class MEDIA_EXPORT AudioOutputDevice
   virtual void OnIPCClosed() OVERRIDE;
 
   // Creates an uninitialized AudioOutputDevice. Clients must call Initialize()
-  // before using.
-  // TODO(tommi): When all dependencies on |content| have been removed
-  // from AudioOutputDevice, move this class over to media/audio.
+  // before using. Takes ownership of |ipc|.
   AudioOutputDevice(AudioOutputIPC* ipc,
                     const scoped_refptr<base::MessageLoopProxy>& io_loop);
 
@@ -128,7 +126,7 @@ class MEDIA_EXPORT AudioOutputDevice
 
   // A pointer to the IPC layer that takes care of sending requests over to
   // the AudioRendererHost.
-  AudioOutputIPC* ipc_;
+  scoped_ptr<AudioOutputIPC> ipc_;
 
   // Our stream ID on the message filter. Only accessed on the IO thread.
   // Must only be modified on the IO thread.