Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

content/renderer/pepper/pepper_platform_audio_input_impl.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.
 
 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_INPUT_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_INPUT_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "content/renderer/media/audio_input_message_filter.h"
+#include "media/audio/audio_input_ipc.h"
 #include "media/audio/audio_parameters.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
 namespace media {
 class AudioParameters;
 }
 
 namespace content {
 
-class AudioInputMessageFilter;
 class PepperPluginDelegateImpl;
 
 // PepperPlatformAudioInputImpl is operated on two threads: the main thread (the
 // thread on which objects are created) and the I/O thread. All public methods,
 // except the destructor, must be called on the main thread. The notifications
 // to the users of this class (via the PlatformAudioInputClient interface) are
 // also sent on the main thread. Internally, this class sends audio input IPC
 // messages and receives media::AudioInputIPCDelegate notifications on the
 // I/O thread.
 
@@ skipping 51 matching lines @@
                       bool succeeded,
                       const std::string& label);
   void CloseDevice();
   void NotifyStreamCreationFailed();
 
   // The client to notify when the stream is created. THIS MUST ONLY BE
   // ACCESSED ON THE MAIN THREAD.
   webkit::ppapi::PluginDelegate::PlatformAudioInputClient* client_;
 
   // Used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE
-  // I/O thread except to send messages and get the message loop.
-  scoped_refptr<AudioInputMessageFilter> 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.
-  int32 stream_id_;
-
-  // The render view into which the audio is sent.
-  int render_view_id_;
+  // I/O THREAD.
+  scoped_ptr<media::AudioInputIPC> ipc_;
 
   base::MessageLoopProxy* main_message_loop_proxy_;
 
   // THIS MUST ONLY BE ACCESSED ON THE MAIN THREAD.
   base::WeakPtr<PepperPluginDelegateImpl> plugin_delegate_;
 
   // The unique ID to identify the opened device. THIS MUST ONLY BE ACCESSED ON
   // THE MAIN THREAD.
   std::string label_;
 
-  // Whether ShutDownOnIOThread() has been called. THIS MUST ONLY BE ACCESSED ON
-  // THE I/O THREAD.
-  bool shutdown_called_;
-
   // Initialized on the main thread and accessed on the I/O thread afterwards.
   media::AudioParameters params_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioInputImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_INPUT_IMPL_H_