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

ppapi/proxy/ppb_audio_config_proxy.cc

Index: ppapi/proxy/ppb_audio_config_proxy.cc
===================================================================
--- ppapi/proxy/ppb_audio_config_proxy.cc	(revision 71486)
+++ ppapi/proxy/ppb_audio_config_proxy.cc	(working copy)
@@ -4,7 +4,7 @@
 
 #include "ppapi/proxy/ppb_audio_config_proxy.h"
 
-#include "ppapi/c/dev/ppb_audio_config_dev.h"
+#include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ -14,7 +14,7 @@
 
 class AudioConfig : public PluginResource {
  public:
-  AudioConfig(PP_AudioSampleRate_Dev sample_rate, uint32_t sample_frame_count)
+  AudioConfig(PP_AudioSampleRate sample_rate, uint32_t sample_frame_count)
       : sample_rate_(sample_rate),
         sample_frame_count_(sample_frame_count) {
   }
@@ -23,11 +23,11 @@
   // Resource overrides.
   virtual AudioConfig* AsAudioConfig() { return this; }
 
-  PP_AudioSampleRate_Dev sample_rate() const { return sample_rate_; }
+  PP_AudioSampleRate sample_rate() const { return sample_rate_; }
   uint32_t sample_frame_count() const { return sample_frame_count_; }
 
  private:
-  PP_AudioSampleRate_Dev sample_rate_;
+  PP_AudioSampleRate sample_rate_;
   uint32_t sample_frame_count_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioConfig);
@@ -36,7 +36,7 @@
 namespace {
 
 PP_Resource CreateStereo16bit(PP_Module module_id,
-                              PP_AudioSampleRate_Dev sample_rate,
+                              PP_AudioSampleRate sample_rate,
                               uint32_t sample_frame_count) {
   PP_Resource result = 0;
   PluginDispatcher::Get()->Send(new PpapiHostMsg_PPBAudioConfig_Create(
@@ -53,12 +53,13 @@
   return result;
 }
 
-uint32_t RecommendSampleFrameCount(uint32_t requested_sample_frame_count) {
+uint32_t RecommendSampleFrameCount(PP_AudioSampleRate sample_rate,
+                                   uint32_t requested_sample_frame_count) {
   uint32_t result = 0;
   PluginDispatcher::Get()->Send(
       new PpapiHostMsg_PPBAudioConfig_RecommendSampleFrameCount(
-          INTERFACE_ID_PPB_AUDIO_CONFIG, requested_sample_frame_count,
-          &result));
+          INTERFACE_ID_PPB_AUDIO_CONFIG, static_cast<int32_t>(sample_rate),
+          requested_sample_frame_count, &result));
   return result;
 }
 
@@ -67,7 +68,7 @@
   return BoolToPPBool(!!object);
 }
 
-PP_AudioSampleRate_Dev GetSampleRate(PP_Resource config_id) {
+PP_AudioSampleRate GetSampleRate(PP_Resource config_id) {
   AudioConfig* object = PluginResource::GetAs<AudioConfig>(config_id);
   if (!object)
     return PP_AUDIOSAMPLERATE_NONE;
@@ -81,7 +82,7 @@
   return object->sample_frame_count();
 }
 
-const PPB_AudioConfig_Dev audio_config_interface = {
+const PPB_AudioConfig audio_config_interface = {
   &CreateStereo16bit,
   &RecommendSampleFrameCount,
   &IsAudioConfig,
@@ -124,14 +125,17 @@
                                                    uint32_t sample_frame_count,
                                                    PP_Resource* result) {
   *result = ppb_audio_config_target()->CreateStereo16Bit(
-      module, static_cast<PP_AudioSampleRate_Dev>(sample_rate),
+      module, static_cast<PP_AudioSampleRate>(sample_rate),
       sample_frame_count);
 }
 
 void PPB_AudioConfig_Proxy::OnMsgRecommendSampleFrameCount(
-    uint32_t requested,
+    int32_t sample_rate,
+    uint32_t requested_sample_frame_count,
     uint32_t* result) {
-  *result = ppb_audio_config_target()->RecommendSampleFrameCount(requested);
+  *result = ppb_audio_config_target()->RecommendSampleFrameCount(
+      static_cast<PP_AudioSampleRate>(sample_rate),
+      requested_sample_frame_count);
 }
 
 }  // namespace proxy