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

ppapi/shared_impl/audio_config_impl.cc

Index: ppapi/shared_impl/audio_config_impl.cc
diff --git a/ppapi/shared_impl/audio_config_impl.cc b/ppapi/shared_impl/audio_config_impl.cc
index da4d8c58ba5dd132e240d30db72095aa58cc6146..843f2d11efe3c1e994012357feb1c346fc220aaa 100644
--- a/ppapi/shared_impl/audio_config_impl.cc
+++ b/ppapi/shared_impl/audio_config_impl.cc
@@ -6,14 +6,54 @@
 
 namespace ppapi {
 
-AudioConfigImpl::AudioConfigImpl()
-    : sample_rate_(PP_AUDIOSAMPLERATE_NONE),
+AudioConfigImpl::AudioConfigImpl(PP_Instance instance)
+    : Resource(instance),
+      sample_rate_(PP_AUDIOSAMPLERATE_NONE),
+      sample_frame_count_(0) {
+}
+
+AudioConfigImpl::AudioConfigImpl(const HostResource& host_resource)
+    : Resource(host_resource),
+      sample_rate_(PP_AUDIOSAMPLERATE_NONE),
       sample_frame_count_(0) {
 }
 
 AudioConfigImpl::~AudioConfigImpl() {
 }
 
+// static
+PP_Resource AudioConfigImpl::CreateAsImpl(PP_Instance instance,
+                                          PP_AudioSampleRate sample_rate,
+                                          uint32_t sample_frame_count) {
+  scoped_refptr<AudioConfigImpl> object(new AudioConfigImpl(instance));
+  if (!object->Init(sample_rate, sample_frame_count))
+    return 0;
+  return object->GetReference();
+}
+
+// static
+PP_Resource AudioConfigImpl::CreateAsProxy(PP_Instance instance,
+                                           PP_AudioSampleRate sample_rate,
+                                           uint32_t sample_frame_count) {
+  scoped_refptr<AudioConfigImpl> object(new AudioConfigImpl(
+      HostResource::MakeInstanceOnly(instance)));
+  if (!object->Init(sample_rate, sample_frame_count))
+    return 0;
+  return object->GetReference();
+}
+
+thunk::PPB_AudioConfig_API* AudioConfigImpl::AsPPB_AudioConfig_API() {
+  return this;
+}
+
+PP_AudioSampleRate AudioConfigImpl::GetSampleRate() {
+  return sample_rate_;
+}
+
+uint32_t AudioConfigImpl::GetSampleFrameCount() {
+  return sample_frame_count_;
+}
+
 bool AudioConfigImpl::Init(PP_AudioSampleRate sample_rate,
                            uint32_t sample_frame_count) {
   // TODO(brettw): Currently we don't actually check what the hardware
@@ -33,12 +73,4 @@ bool AudioConfigImpl::Init(PP_AudioSampleRate sample_rate,
   return true;
 }
 
-PP_AudioSampleRate AudioConfigImpl::GetSampleRate() {
-  return sample_rate_;
-}
-
-uint32_t AudioConfigImpl::GetSampleFrameCount() {
-  return sample_frame_count_;
-}
-
 }  // namespace ppapi