1 files changed, 3 insertions, 39 deletions

diff --git a/ppapi/cpp/dev/audio_input_dev.cc b/ppapi/cpp/dev/audio_input_dev.cc
index 0c2f377..463245d 100644
--- a/ppapi/cpp/dev/audio_input_dev.cc
+++ b/ppapi/cpp/dev/audio_input_dev.cc
@@ -14,10 +14,6 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_AudioInput_Dev_0_2>() {
-  return PPB_AUDIO_INPUT_DEV_INTERFACE_0_2;
-}
-
 template <> const char* interface_name<PPB_AudioInput_Dev_0_3>() {
   return PPB_AUDIO_INPUT_DEV_INTERFACE_0_3;
 }
@@ -38,9 +34,6 @@ AudioInput_Dev::AudioInput_Dev(const InstanceHandle& instance) {
   } else if (has_interface<PPB_AudioInput_Dev_0_3>()) {
     PassRefFromConstructor(get_interface<PPB_AudioInput_Dev_0_3>()->Create(
         instance.pp_instance()));
-  } else if (has_interface<PPB_AudioInput_Dev_0_2>()) {
-    PassRefFromConstructor(get_interface<PPB_AudioInput_Dev_0_2>()->Create(
-        instance.pp_instance()));
   }
 }
 
@@ -50,8 +43,7 @@ AudioInput_Dev::~AudioInput_Dev() {
 // static
 bool AudioInput_Dev::IsAvailable() {
   return has_interface<PPB_AudioInput_Dev_0_4>() ||
-         has_interface<PPB_AudioInput_Dev_0_3>() ||
-         has_interface<PPB_AudioInput_Dev_0_2>();
+         has_interface<PPB_AudioInput_Dev_0_3>();
 }
 
 int32_t AudioInput_Dev::EnumerateDevices(
@@ -64,19 +56,6 @@ int32_t AudioInput_Dev::EnumerateDevices(
     return get_interface<PPB_AudioInput_Dev_0_3>()->EnumerateDevices(
         pp_resource(), callback.output(), callback.pp_completion_callback());
   }
-  if (has_interface<PPB_AudioInput_Dev_0_2>()) {
-    if (!callback.pp_completion_callback().func)
-      return callback.MayForce(PP_ERROR_BLOCKS_MAIN_THREAD);
-
-    // ArrayOutputCallbackConverter is responsible to delete it.
-    ResourceArray_Dev::ArrayOutputCallbackData* data =
-        new ResourceArray_Dev::ArrayOutputCallbackData(
-            callback.output(), callback.pp_completion_callback());
-    return get_interface<PPB_AudioInput_Dev_0_2>()->EnumerateDevices(
-        pp_resource(), &data->resource_array_output,
-        PP_MakeCompletionCallback(
-            &ResourceArray_Dev::ArrayOutputCallbackConverter, data));
-  }
 
   return callback.MayForce(PP_ERROR_NOINTERFACE);
 }
@@ -113,18 +92,13 @@ int32_t AudioInput_Dev::Open(const DeviceRef_Dev& device_ref,
 int32_t AudioInput_Dev::Open(
     const DeviceRef_Dev& device_ref,
     const AudioConfig& config,
-    PPB_AudioInput_Callback_0_2 audio_input_callback_0_2,
+    PPB_AudioInput_Callback_0_3 audio_input_callback_0_3,
     void* user_data,
     const CompletionCallback& callback) {
   if (has_interface<PPB_AudioInput_Dev_0_3>()) {
     return get_interface<PPB_AudioInput_Dev_0_3>()->Open(
         pp_resource(), device_ref.pp_resource(), config.pp_resource(),
-        audio_input_callback_0_2, user_data, callback.pp_completion_callback());
-  }
-  if (has_interface<PPB_AudioInput_Dev_0_2>()) {
-    return get_interface<PPB_AudioInput_Dev_0_2>()->Open(
-        pp_resource(), device_ref.pp_resource(), config.pp_resource(),
-        audio_input_callback_0_2, user_data, callback.pp_completion_callback());
+        audio_input_callback_0_3, user_data, callback.pp_completion_callback());
   }
 
   return callback.MayForce(PP_ERROR_NOINTERFACE);
@@ -139,10 +113,6 @@ bool AudioInput_Dev::StartCapture() {
     return PP_ToBool(get_interface<PPB_AudioInput_Dev_0_3>()->StartCapture(
         pp_resource()));
   }
-  if (has_interface<PPB_AudioInput_Dev_0_2>()) {
-    return PP_ToBool(get_interface<PPB_AudioInput_Dev_0_2>()->StartCapture(
-        pp_resource()));
-  }
 
   return false;
 }
@@ -156,10 +126,6 @@ bool AudioInput_Dev::StopCapture() {
     return PP_ToBool(get_interface<PPB_AudioInput_Dev_0_3>()->StopCapture(
         pp_resource()));
   }
-  if (has_interface<PPB_AudioInput_Dev_0_2>()) {
-    return PP_ToBool(get_interface<PPB_AudioInput_Dev_0_2>()->StopCapture(
-        pp_resource()));
-  }
 
   return false;
 }
@@ -169,8 +135,6 @@ void AudioInput_Dev::Close() {
     get_interface<PPB_AudioInput_Dev_0_4>()->Close(pp_resource());
   } else if (has_interface<PPB_AudioInput_Dev_0_3>()) {
     get_interface<PPB_AudioInput_Dev_0_3>()->Close(pp_resource());
-  } else if (has_interface<PPB_AudioInput_Dev_0_2>()) {
-    get_interface<PPB_AudioInput_Dev_0_2>()->Close(pp_resource());
   }
 }