Move ppapi audio interface out of dev, but...

webkit/plugins/ppapi/ppb_audio_impl.h

 // Copyright (c) 2010 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_DEVICE_CONTEXT_AUDIO_H_
 #define WEBKIT_PLUGINS_PPAPI_DEVICE_CONTEXT_AUDIO_H_
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
-#include "ppapi/c/dev/ppb_audio_dev.h"
-#include "ppapi/c/dev/ppb_audio_config_dev.h"
-#include "ppapi/c/dev/ppb_audio_trusted_dev.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_impl.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource.h"
 
 namespace webkit {
 namespace ppapi {
 
 class PluginInstance;
 class PluginModule;
 
 class PPB_AudioConfig_Impl : public Resource {
  public:
   PPB_AudioConfig_Impl(PluginModule* module,
-                       PP_AudioSampleRate_Dev sample_rate,
+                       PP_AudioSampleRate sample_rate,
                        uint32_t sample_frame_count);
   size_t BufferSize();
-  static const PPB_AudioConfig_Dev* GetInterface();
+  static const PPB_AudioConfig* GetInterface();
 
-  PP_AudioSampleRate_Dev sample_rate() { return sample_rate_; }
+  PP_AudioSampleRate sample_rate() { return sample_rate_; }
   uint32_t sample_frame_count() { return sample_frame_count_; }
 
  private:
   // Resource override.
   virtual PPB_AudioConfig_Impl* AsPPB_AudioConfig_Impl();
 
-  PP_AudioSampleRate_Dev sample_rate_;
+  PP_AudioSampleRate sample_rate_;
   uint32_t sample_frame_count_;
 };
 
 // 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 Resource,
                        public pp::shared_impl::AudioImpl,
                        public PluginDelegate::PlatformAudio::Client {
  public:
   explicit PPB_Audio_Impl(PluginModule* module, PP_Instance instance_id);
   virtual ~PPB_Audio_Impl();
 
-  static const PPB_Audio_Dev* GetInterface();
-  static const PPB_AudioTrusted_Dev* GetTrustedInterface();
+  static const PPB_Audio* GetInterface();
+  static const PPB_AudioTrusted* GetTrustedInterface();
 
   PP_Instance pp_instance() {
     return pp_instance_;
   }
 
   // PPB_Audio implementation.
   bool Init(PluginDelegate* plugin_delegate,
             PP_Resource config_id,
             PPB_Audio_Callback user_callback, void* user_data);
   PP_Resource GetCurrentConfig();
@@ skipping 39 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_DEVICE_CONTEXT_AUDIO_H_