Part 1: Plumb render view ID to render host

media/audio/audio_output_device.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Audio rendering unit utilizing audio output stream provided by browser
 // process through IPC.
 //
 // Relationship of classes.
 //
 //  AudioOutputController                AudioOutputDevice
@@ skipping 77 matching lines @@
 
   // Methods called on IO thread ----------------------------------------------
   // AudioOutputIPCDelegate methods.
   virtual void OnStateChanged(AudioOutputIPCDelegate::State state) OVERRIDE;
   virtual void OnStreamCreated(base::SharedMemoryHandle handle,
                                base::SyncSocket::Handle socket_handle,
                                int length) OVERRIDE;
   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 owner ship of |ipc|.

[tommi (sloooow) - chröme, 2012/07/31 10:52:41]

great.
also, s/owner ship/ownership.

[sail, 2012/07/31 22:02:08]

Done.

   AudioOutputDevice(AudioOutputIPC* ipc,
                     const scoped_refptr<base::MessageLoopProxy>& io_loop);
 
  protected:
   // Magic required by ref_counted.h to avoid any code deleting the object
   // accidentally while there are references to it.
   friend class base::RefCountedThreadSafe<AudioOutputDevice>;
   virtual ~AudioOutputDevice();
 
  private:
@@ skipping 10 matching lines @@
   // MessageLoop::DestructionObserver implementation for the IO loop.
   // If the IO loop dies before we do, we shut down the audio thread from here.
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
   AudioParameters audio_parameters_;
 
   RenderCallback* callback_;
 
   // 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.
   int stream_id_;
 
   // State of Play() / Pause() calls before OnStreamCreated() is called.
   bool play_on_start_;
 
   // Set to |true| when OnStreamCreated() is called.
   // Set to |false| when ShutDownOnIOThread() is called.
@@ skipping 10 matching lines @@
   AudioDeviceThread audio_thread_;
   scoped_ptr<AudioOutputDevice::AudioThreadCallback> audio_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputDevice);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_DEVICE_H_