Merge the plugin and impl side of the audio config and input event resources.

webkit/plugins/ppapi/ppb_audio_impl.h

 // Copyright (c) 2011 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 WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/trusted/ppb_audio_trusted.h"
 #include "ppapi/shared_impl/audio_config_impl.h"
 #include "ppapi/shared_impl/audio_impl.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
 #include "ppapi/shared_impl/resource.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 namespace webkit {
 namespace ppapi {
 
-// The implementation is actually in AudioConfigImpl.
-class PPB_AudioConfig_Impl : public ::ppapi::Resource,
-                             public ::ppapi::AudioConfigImpl {
- public:
-  virtual ~PPB_AudioConfig_Impl();
-
-  // Non-trusted creation.
-  static PP_Resource Create(PP_Instance instance,
-                            PP_AudioSampleRate sample_rate,
-                            uint32_t sample_frame_count);
-
-  // Resource overrides.
-  virtual ::ppapi::thunk::PPB_AudioConfig_API* AsPPB_AudioConfig_API() OVERRIDE;
-
- private:
-  explicit PPB_AudioConfig_Impl(PP_Instance instance);
-
-  DISALLOW_COPY_AND_ASSIGN(PPB_AudioConfig_Impl);
-};
-
 // Some of the backend functionality of this class is implemented by the
 // AudioImpl so it can be shared with the proxy.
 class PPB_Audio_Impl : public ::ppapi::Resource,
                        public ::ppapi::AudioImpl,
                        public PluginDelegate::PlatformAudio::Client {
  public:
   // Trusted initialization. You must call Init after this.
   //
   // Untrusted initialization should just call the static Create() function
   // to properly create & initialize this class.
@@ skipping 51 matching lines @@
   size_t shared_memory_size_for_create_callback_;
   scoped_ptr<base::SyncSocket> socket_for_create_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Audio_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_