| Index: content/renderer/pepper/pepper_platform_audio_input_impl.h
|
| diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.h b/content/renderer/pepper/pepper_platform_audio_input_impl.h
|
| index 864afa191d0eb8b8c5da7c7ee37b4fb748568249..87987e1cb2f4aca5455306814699c8adc680e536 100644
|
| --- a/content/renderer/pepper/pepper_platform_audio_input_impl.h
|
| +++ b/content/renderer/pepper/pepper_platform_audio_input_impl.h
|
| @@ -39,6 +39,7 @@ class PepperPlatformAudioInputImpl
|
| // Factory function, returns NULL on failure. StreamCreated() will be called
|
| // when the stream is created.
|
| static PepperPlatformAudioInputImpl* Create(
|
| + int render_view_id,
|
| const base::WeakPtr<PepperPluginDelegateImpl>& plugin_delegate,
|
| const std::string& device_id,
|
| int sample_rate,
|
| @@ -66,7 +67,7 @@ class PepperPlatformAudioInputImpl
|
| private:
|
| friend class base::RefCountedThreadSafe<PepperPlatformAudioInputImpl>;
|
|
|
| - PepperPlatformAudioInputImpl();
|
| + explicit PepperPlatformAudioInputImpl(int render_view_id);
|
|
|
| bool Initialize(
|
| const base::WeakPtr<PepperPluginDelegateImpl>& plugin_delegate,
|
| @@ -93,7 +94,7 @@ class PepperPlatformAudioInputImpl
|
|
|
| // 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::AudioInputIPC* ipc_;
|
| + scoped_ptr<media::AudioInputIPC> 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.
|
| @@ -115,7 +116,7 @@ class PepperPlatformAudioInputImpl
|
| // Initialized on the main thread and accessed on the I/O thread afterwards.
|
| media::AudioParameters params_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioInputImpl);
|
| + DISALLOW_IMPLICIT_CONSTRUCTORS(PepperPlatformAudioInputImpl);
|
| };
|
|
|
| } // namespace content
|
|
|