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

webkit/plugins/ppapi/ppb_audio_impl.cc

 // 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.
 
 #include "webkit/plugins/ppapi/ppb_audio_impl.h"
 
 #include "base/logging.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/resource_tracker.h"
 #include "ppapi/shared_impl/tracker_base.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 #include "ppapi/thunk/thunk.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Audio_API;
 using ppapi::thunk::PPB_AudioConfig_API;
 
 namespace webkit {
 namespace ppapi {
 
-// PPB_AudioConfig -------------------------------------------------------------
-
-PPB_AudioConfig_Impl::PPB_AudioConfig_Impl(PP_Instance instance)
-    : Resource(instance) {
-}
-
-PPB_AudioConfig_Impl::~PPB_AudioConfig_Impl() {
-}
-
-// static
-PP_Resource PPB_AudioConfig_Impl::Create(PP_Instance instance,
-                                         PP_AudioSampleRate sample_rate,
-                                         uint32_t sample_frame_count) {
-  scoped_refptr<PPB_AudioConfig_Impl> config(
-      new PPB_AudioConfig_Impl(instance));
-  if (!config->Init(sample_rate, sample_frame_count))
-    return 0;
-  return config->GetReference();
-}
-
-PPB_AudioConfig_API* PPB_AudioConfig_Impl::AsPPB_AudioConfig_API() {
-  return this;
-}
-
 // PPB_Audio_Impl --------------------------------------------------------------
 
 PPB_Audio_Impl::PPB_Audio_Impl(PP_Instance instance)
     : Resource(instance),
       audio_(NULL),
       create_callback_pending_(false),
       shared_memory_size_for_create_callback_(0) {
   create_callback_ = PP_MakeCompletionCallback(NULL, NULL);
 }
 
@@ skipping 157 matching lines @@
     // something more elaborate like an ACK from the plugin or post a task to
     // the I/O thread and back, but this extra complexity doesn't seem worth it
     // just to clean up these handles faster.
   } else {
     SetStreamInfo(shared_memory_handle, shared_memory_size, socket_handle);
   }
 }
 
 }  // namespace ppapi
 }  // namespace webkit