Pepper: Remove unused interface versions.

Versions 0.2 of PPB_AudioInput_Dev and PPB_VideoCapture_Dev are no longer used.

BUG=

Review URL: https://codereview.chromium.org/115343006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243205 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 31 insertions, 477 deletions

diff --git a/ppapi/api/dev/ppb_audio_input_dev.idl b/ppapi/api/dev/ppb_audio_input_dev.idl
index fe96025..71ce6eb 100644
--- a/ppapi/api/dev/ppb_audio_input_dev.idl
+++ b/ppapi/api/dev/ppb_audio_input_dev.idl
@@ -9,7 +9,6 @@
  */
 
 label Chrome {
-  M19 = 0.2,
   M25 = 0.3,
   M30 = 0.4
 };
@@ -75,33 +74,6 @@ interface PPB_AudioInput_Dev {
   /**
    * Enumerates audio input devices.
    *
-   * Please note that:
-   * - this method ignores the previous value pointed to by <code>devices</code>
-   *   (won't release reference even if it is not 0);
-   * - <code>devices</code> must be valid until <code>callback</code> is called,
-   *   if the method returns <code>PP_OK_COMPLETIONPENDING</code>;
-   * - the ref count of the returned <code>devices</code> has already been
-   *   increased by 1 for the caller.
-   *
-   * @param[in] audio_input A <code>PP_Resource</code> corresponding to an audio
-   * input resource.
-   * @param[out] devices Once the operation is completed successfully,
-   * <code>devices</code> will be set to a <code>PPB_ResourceArray_Dev</code>
-   * resource, which holds a list of <code>PPB_DeviceRef_Dev</code> resources.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to run on
-   * completion.
-   *
-   * @return An error code from <code>pp_errors.h</code>.
-   */
-  [deprecate=0.3]
-  int32_t EnumerateDevices(
-      [in] PP_Resource audio_input,
-      [out] PP_Resource devices,
-      [in] PP_CompletionCallback callback);
-
-  /**
-   * Enumerates audio input devices.
-   *
    * @param[in] audio_input A <code>PP_Resource</code> corresponding to an audio
    * input resource.
    * @param[in] output An output array which will receive
diff --git a/ppapi/api/dev/ppb_video_capture_dev.idl b/ppapi/api/dev/ppb_video_capture_dev.idl
index 8937960..a05374a 100644
--- a/ppapi/api/dev/ppb_video_capture_dev.idl
+++ b/ppapi/api/dev/ppb_video_capture_dev.idl
@@ -7,7 +7,6 @@
  * This file defines the <code>PPB_VideoCapture_Dev</code> interface.
  */
 label Chrome {
-  M19 = 0.2,
   M25 = 0.3
 };
 
@@ -54,25 +53,6 @@ interface PPB_VideoCapture_Dev {
       [in] PP_Resource video_capture);
 
   /**
-   * Enumerates video capture devices. Once the operation is completed
-   * successfully, |devices| will be set to a PPB_ResourceArray_Dev resource,
-   * which holds a list of PPB_DeviceRef_Dev resources.
-   *
-   * Please note that:
-   * - this method ignores the previous value pointed to by |devices| (won't
-   *   release reference even if it is not 0);
-   * - |devices| must be valid until |callback| is called, if the method
-   *   returns PP_OK_COMPLETIONPENDING;
-   * - the ref count of the returned |devices| has already been increased by 1
-   *   for the caller.
-   */
-  [deprecate=0.3]
-  int32_t EnumerateDevices(
-      [in] PP_Resource video_capture,
-      [out] PP_Resource devices,
-      [in] PP_CompletionCallback callback);
-
-  /**
    * Enumerates video capture devices.
    *
    * @param[in] video_capture A <code>PP_Resource</code> corresponding to a
diff --git a/ppapi/c/dev/ppb_audio_input_dev.h b/ppapi/c/dev/ppb_audio_input_dev.h
index 2fd4d07..bd065f0 100644
--- a/ppapi/c/dev/ppb_audio_input_dev.h
+++ b/ppapi/c/dev/ppb_audio_input_dev.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From dev/ppb_audio_input_dev.idl modified Fri May 10 16:06:35 2013. */
+/* From dev/ppb_audio_input_dev.idl modified Thu Dec 12 15:35:39 2013. */
 
 #ifndef PPAPI_C_DEV_PPB_AUDIO_INPUT_DEV_H_
 #define PPAPI_C_DEV_PPB_AUDIO_INPUT_DEV_H_
@@ -18,7 +18,6 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_time.h"
 
-#define PPB_AUDIO_INPUT_DEV_INTERFACE_0_2 "PPB_AudioInput(Dev);0.2"
 #define PPB_AUDIO_INPUT_DEV_INTERFACE_0_3 "PPB_AudioInput(Dev);0.3"
 #define PPB_AUDIO_INPUT_DEV_INTERFACE_0_4 "PPB_AudioInput(Dev);0.4"
 #define PPB_AUDIO_INPUT_DEV_INTERFACE PPB_AUDIO_INPUT_DEV_INTERFACE_0_4
@@ -50,7 +49,7 @@ typedef void (*PPB_AudioInput_Callback)(const void* sample_buffer,
                                         PP_TimeDelta latency,
                                         void* user_data);
 
-typedef void (*PPB_AudioInput_Callback_0_2)(const void* sample_buffer,
+typedef void (*PPB_AudioInput_Callback_0_3)(const void* sample_buffer,
                                             uint32_t buffer_size_in_bytes,
                                             void* user_data);
 /**
@@ -211,24 +210,6 @@ struct PPB_AudioInput_Dev_0_4 {
 
 typedef struct PPB_AudioInput_Dev_0_4 PPB_AudioInput_Dev;
 
-struct PPB_AudioInput_Dev_0_2 {
-  PP_Resource (*Create)(PP_Instance instance);
-  PP_Bool (*IsAudioInput)(PP_Resource resource);
-  int32_t (*EnumerateDevices)(PP_Resource audio_input,
-                              PP_Resource* devices,
-                              struct PP_CompletionCallback callback);
-  int32_t (*Open)(PP_Resource audio_input,
-                  PP_Resource device_ref,
-                  PP_Resource config,
-                  PPB_AudioInput_Callback_0_2 audio_input_callback,
-                  void* user_data,
-                  struct PP_CompletionCallback callback);
-  PP_Resource (*GetCurrentConfig)(PP_Resource audio_input);
-  PP_Bool (*StartCapture)(PP_Resource audio_input);
-  PP_Bool (*StopCapture)(PP_Resource audio_input);
-  void (*Close)(PP_Resource audio_input);
-};
-
 struct PPB_AudioInput_Dev_0_3 {
   PP_Resource (*Create)(PP_Instance instance);
   PP_Bool (*IsAudioInput)(PP_Resource resource);
@@ -241,7 +222,7 @@ struct PPB_AudioInput_Dev_0_3 {
   int32_t (*Open)(PP_Resource audio_input,
                   PP_Resource device_ref,
                   PP_Resource config,
-                  PPB_AudioInput_Callback_0_2 audio_input_callback,
+                  PPB_AudioInput_Callback_0_3 audio_input_callback,
                   void* user_data,
                   struct PP_CompletionCallback callback);
   PP_Resource (*GetCurrentConfig)(PP_Resource audio_input);
diff --git a/ppapi/c/dev/ppb_video_capture_dev.h b/ppapi/c/dev/ppb_video_capture_dev.h
index a4704b2..30f543e 100644
--- a/ppapi/c/dev/ppb_video_capture_dev.h
+++ b/ppapi/c/dev/ppb_video_capture_dev.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From dev/ppb_video_capture_dev.idl modified Wed Dec 05 13:18:10 2012. */
+/* From dev/ppb_video_capture_dev.idl modified Thu Dec 12 15:36:11 2013. */
 
 #ifndef PPAPI_C_DEV_PPB_VIDEO_CAPTURE_DEV_H_
 #define PPAPI_C_DEV_PPB_VIDEO_CAPTURE_DEV_H_
@@ -18,7 +18,6 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_VIDEOCAPTURE_DEV_INTERFACE_0_2 "PPB_VideoCapture(Dev);0.2"
 #define PPB_VIDEOCAPTURE_DEV_INTERFACE_0_3 "PPB_VideoCapture(Dev);0.3"
 #define PPB_VIDEOCAPTURE_DEV_INTERFACE PPB_VIDEOCAPTURE_DEV_INTERFACE_0_3
 
@@ -160,23 +159,6 @@ struct PPB_VideoCapture_Dev_0_3 {
 };
 
 typedef struct PPB_VideoCapture_Dev_0_3 PPB_VideoCapture_Dev;
-
-struct PPB_VideoCapture_Dev_0_2 {
-  PP_Resource (*Create)(PP_Instance instance);
-  PP_Bool (*IsVideoCapture)(PP_Resource video_capture);
-  int32_t (*EnumerateDevices)(PP_Resource video_capture,
-                              PP_Resource* devices,
-                              struct PP_CompletionCallback callback);
-  int32_t (*Open)(PP_Resource video_capture,
-                  PP_Resource device_ref,
-                  const struct PP_VideoCaptureDeviceInfo_Dev* requested_info,
-                  uint32_t buffer_count,
-                  struct PP_CompletionCallback callback);
-  int32_t (*StartCapture)(PP_Resource video_capture);
-  int32_t (*ReuseBuffer)(PP_Resource video_capture, uint32_t buffer);
-  int32_t (*StopCapture)(PP_Resource video_capture);
-  void (*Close)(PP_Resource video_capture);
-};
 /**
  * @}
  */
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());
   }
 }
 
diff --git a/ppapi/cpp/dev/audio_input_dev.h b/ppapi/cpp/dev/audio_input_dev.h
index cb1f4ef..a6e5a54 100644
--- a/ppapi/cpp/dev/audio_input_dev.h
+++ b/ppapi/cpp/dev/audio_input_dev.h
@@ -50,10 +50,10 @@ class AudioInput_Dev : public Resource {
                void* user_data,
                const CompletionCallback& callback);
 
-  /// Requires <code>PPB_AudioInput_Dev</code> version 0.2 or 0.3.
+  /// Requires <code>PPB_AudioInput_Dev</code> version 0.3.
   int32_t 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);
 
diff --git a/ppapi/cpp/dev/video_capture_dev.cc b/ppapi/cpp/dev/video_capture_dev.cc
index 46fdb59..49d2741 100644
--- a/ppapi/cpp/dev/video_capture_dev.cc
+++ b/ppapi/cpp/dev/video_capture_dev.cc
@@ -14,10 +14,6 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_VideoCapture_Dev_0_2>() {
-  return PPB_VIDEOCAPTURE_DEV_INTERFACE_0_2;
-}
-
 template <> const char* interface_name<PPB_VideoCapture_Dev_0_3>() {
   return PPB_VIDEOCAPTURE_DEV_INTERFACE_0_3;
 }
@@ -28,9 +24,6 @@ VideoCapture_Dev::VideoCapture_Dev(const InstanceHandle& instance) {
   if (has_interface<PPB_VideoCapture_Dev_0_3>()) {
     PassRefFromConstructor(get_interface<PPB_VideoCapture_Dev_0_3>()->Create(
         instance.pp_instance()));
-  } else if (has_interface<PPB_VideoCapture_Dev_0_2>()) {
-    PassRefFromConstructor(get_interface<PPB_VideoCapture_Dev_0_2>()->Create(
-        instance.pp_instance()));
   }
 }
 
@@ -43,8 +36,7 @@ VideoCapture_Dev::~VideoCapture_Dev() {
 
 // static
 bool VideoCapture_Dev::IsAvailable() {
-  return has_interface<PPB_VideoCapture_Dev_0_3>() ||
-         has_interface<PPB_VideoCapture_Dev_0_2>();
+  return has_interface<PPB_VideoCapture_Dev_0_3>();
 }
 
 int32_t VideoCapture_Dev::EnumerateDevices(
@@ -54,20 +46,6 @@ int32_t VideoCapture_Dev::EnumerateDevices(
         pp_resource(), callback.output(), callback.pp_completion_callback());
   }
 
-  if (has_interface<PPB_VideoCapture_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_VideoCapture_Dev_0_2>()->EnumerateDevices(
-        pp_resource(), &data->resource_array_output,
-        PP_MakeCompletionCallback(
-            &ResourceArray_Dev::ArrayOutputCallbackConverter, data));
-  }
-
   return callback.MayForce(PP_ERROR_NOINTERFACE);
 }
 
@@ -92,11 +70,6 @@ int32_t VideoCapture_Dev::Open(
         pp_resource(), device_ref.pp_resource(), &requested_info, buffer_count,
         callback.pp_completion_callback());
   }
-  if (has_interface<PPB_VideoCapture_Dev_0_2>()) {
-    return get_interface<PPB_VideoCapture_Dev_0_2>()->Open(
-        pp_resource(), device_ref.pp_resource(), &requested_info, buffer_count,
-        callback.pp_completion_callback());
-  }
 
   return callback.MayForce(PP_ERROR_NOINTERFACE);
 }
@@ -106,10 +79,6 @@ int32_t VideoCapture_Dev::StartCapture() {
     return get_interface<PPB_VideoCapture_Dev_0_3>()->StartCapture(
         pp_resource());
   }
-  if (has_interface<PPB_VideoCapture_Dev_0_2>()) {
-    return get_interface<PPB_VideoCapture_Dev_0_2>()->StartCapture(
-        pp_resource());
-  }
 
   return PP_ERROR_NOINTERFACE;
 }
@@ -119,10 +88,6 @@ int32_t VideoCapture_Dev::ReuseBuffer(uint32_t buffer) {
     return get_interface<PPB_VideoCapture_Dev_0_3>()->ReuseBuffer(pp_resource(),
                                                                   buffer);
   }
-  if (has_interface<PPB_VideoCapture_Dev_0_2>()) {
-    return get_interface<PPB_VideoCapture_Dev_0_2>()->ReuseBuffer(pp_resource(),
-                                                                  buffer);
-  }
 
   return PP_ERROR_NOINTERFACE;
 }
@@ -132,10 +97,6 @@ int32_t VideoCapture_Dev::StopCapture() {
     return get_interface<PPB_VideoCapture_Dev_0_3>()->StopCapture(
         pp_resource());
   }
-  if (has_interface<PPB_VideoCapture_Dev_0_2>()) {
-    return get_interface<PPB_VideoCapture_Dev_0_2>()->StopCapture(
-        pp_resource());
-  }
 
   return PP_ERROR_NOINTERFACE;
 }
@@ -143,8 +104,6 @@ int32_t VideoCapture_Dev::StopCapture() {
 void VideoCapture_Dev::Close() {
   if (has_interface<PPB_VideoCapture_Dev_0_3>()) {
     get_interface<PPB_VideoCapture_Dev_0_3>()->Close(pp_resource());
-  } else if (has_interface<PPB_VideoCapture_Dev_0_2>()) {
-    get_interface<PPB_VideoCapture_Dev_0_2>()->Close(pp_resource());
   }
 }
 
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index 5c41c6a..c83a1f6d 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -178,7 +178,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarDictionary_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WebSocket_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Messaging_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Alarms_Dev_0_1;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_4;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1;
@@ -194,7 +193,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TrueTypeFont_Dev_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLUtil_Dev_0_6;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLUtil_Dev_0_7;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarResource_Dev_0_1;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_3;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_Dev_0_16;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Selection_Dev_0_3;
@@ -1699,50 +1697,6 @@ static uint32_t Pnacl_M33_PPB_Alarms_Dev_AddOnAlarmListener(PP_Instance instance
 
 /* End wrapper methods for PPB_Alarms_Dev_0_1 */
 
-/* Begin wrapper methods for PPB_AudioInput_Dev_0_2 */
-
-static PP_Resource Pnacl_M19_PPB_AudioInput_Dev_Create(PP_Instance instance) {
-  const struct PPB_AudioInput_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2.real_iface;
-  return iface->Create(instance);
-}
-
-static PP_Bool Pnacl_M19_PPB_AudioInput_Dev_IsAudioInput(PP_Resource resource) {
-  const struct PPB_AudioInput_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2.real_iface;
-  return iface->IsAudioInput(resource);
-}
-
-static int32_t Pnacl_M19_PPB_AudioInput_Dev_EnumerateDevices(PP_Resource audio_input, PP_Resource* devices, struct PP_CompletionCallback* callback) {
-  const struct PPB_AudioInput_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2.real_iface;
-  return iface->EnumerateDevices(audio_input, devices, *callback);
-}
-
-static int32_t Pnacl_M19_PPB_AudioInput_Dev_Open(PP_Resource audio_input, PP_Resource device_ref, PP_Resource config, PPB_AudioInput_Callback_0_2 audio_input_callback, void* user_data, struct PP_CompletionCallback* callback) {
-  const struct PPB_AudioInput_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2.real_iface;
-  return iface->Open(audio_input, device_ref, config, audio_input_callback, user_data, *callback);
-}
-
-static PP_Resource Pnacl_M19_PPB_AudioInput_Dev_GetCurrentConfig(PP_Resource audio_input) {
-  const struct PPB_AudioInput_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2.real_iface;
-  return iface->GetCurrentConfig(audio_input);
-}
-
-static PP_Bool Pnacl_M19_PPB_AudioInput_Dev_StartCapture(PP_Resource audio_input) {
-  const struct PPB_AudioInput_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2.real_iface;
-  return iface->StartCapture(audio_input);
-}
-
-static PP_Bool Pnacl_M19_PPB_AudioInput_Dev_StopCapture(PP_Resource audio_input) {
-  const struct PPB_AudioInput_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2.real_iface;
-  return iface->StopCapture(audio_input);
-}
-
-static void Pnacl_M19_PPB_AudioInput_Dev_Close(PP_Resource audio_input) {
-  const struct PPB_AudioInput_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2.real_iface;
-  iface->Close(audio_input);
-}
-
-/* End wrapper methods for PPB_AudioInput_Dev_0_2 */
-
 /* Begin wrapper methods for PPB_AudioInput_Dev_0_3 */
 
 static PP_Resource Pnacl_M25_PPB_AudioInput_Dev_Create(PP_Instance instance) {
@@ -1765,7 +1719,7 @@ static int32_t Pnacl_M25_PPB_AudioInput_Dev_MonitorDeviceChange(PP_Resource audi
   return iface->MonitorDeviceChange(audio_input, callback, user_data);
 }
 
-static int32_t Pnacl_M25_PPB_AudioInput_Dev_Open(PP_Resource audio_input, PP_Resource device_ref, PP_Resource config, PPB_AudioInput_Callback_0_2 audio_input_callback, void* user_data, struct PP_CompletionCallback* callback) {
+static int32_t Pnacl_M25_PPB_AudioInput_Dev_Open(PP_Resource audio_input, PP_Resource device_ref, PP_Resource config, PPB_AudioInput_Callback_0_3 audio_input_callback, void* user_data, struct PP_CompletionCallback* callback) {
   const struct PPB_AudioInput_Dev_0_3 *iface = Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3.real_iface;
   return iface->Open(audio_input, device_ref, config, audio_input_callback, user_data, *callback);
 }
@@ -2244,50 +2198,6 @@ static void Pnacl_M32_PPB_VarResource_Dev_VarFromResource(struct PP_Var* _struct
 
 /* End wrapper methods for PPB_VarResource_Dev_0_1 */
 
-/* Begin wrapper methods for PPB_VideoCapture_Dev_0_2 */
-
-static PP_Resource Pnacl_M19_PPB_VideoCapture_Dev_Create(PP_Instance instance) {
-  const struct PPB_VideoCapture_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2.real_iface;
-  return iface->Create(instance);
-}
-
-static PP_Bool Pnacl_M19_PPB_VideoCapture_Dev_IsVideoCapture(PP_Resource video_capture) {
-  const struct PPB_VideoCapture_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2.real_iface;
-  return iface->IsVideoCapture(video_capture);
-}
-
-static int32_t Pnacl_M19_PPB_VideoCapture_Dev_EnumerateDevices(PP_Resource video_capture, PP_Resource* devices, struct PP_CompletionCallback* callback) {
-  const struct PPB_VideoCapture_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2.real_iface;
-  return iface->EnumerateDevices(video_capture, devices, *callback);
-}
-
-static int32_t Pnacl_M19_PPB_VideoCapture_Dev_Open(PP_Resource video_capture, PP_Resource device_ref, const struct PP_VideoCaptureDeviceInfo_Dev* requested_info, uint32_t buffer_count, struct PP_CompletionCallback* callback) {
-  const struct PPB_VideoCapture_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2.real_iface;
-  return iface->Open(video_capture, device_ref, requested_info, buffer_count, *callback);
-}
-
-static int32_t Pnacl_M19_PPB_VideoCapture_Dev_StartCapture(PP_Resource video_capture) {
-  const struct PPB_VideoCapture_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2.real_iface;
-  return iface->StartCapture(video_capture);
-}
-
-static int32_t Pnacl_M19_PPB_VideoCapture_Dev_ReuseBuffer(PP_Resource video_capture, uint32_t buffer) {
-  const struct PPB_VideoCapture_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2.real_iface;
-  return iface->ReuseBuffer(video_capture, buffer);
-}
-
-static int32_t Pnacl_M19_PPB_VideoCapture_Dev_StopCapture(PP_Resource video_capture) {
-  const struct PPB_VideoCapture_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2.real_iface;
-  return iface->StopCapture(video_capture);
-}
-
-static void Pnacl_M19_PPB_VideoCapture_Dev_Close(PP_Resource video_capture) {
-  const struct PPB_VideoCapture_Dev_0_2 *iface = Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2.real_iface;
-  iface->Close(video_capture);
-}
-
-/* End wrapper methods for PPB_VideoCapture_Dev_0_2 */
-
 /* Begin wrapper methods for PPB_VideoCapture_Dev_0_3 */
 
 static PP_Resource Pnacl_M25_PPB_VideoCapture_Dev_Create(PP_Instance instance) {
@@ -4532,23 +4442,12 @@ struct PPB_Alarms_Dev_0_1 Pnacl_Wrappers_PPB_Alarms_Dev_0_1 = {
     .AddOnAlarmListener = (uint32_t (*)(PP_Instance instance, PP_Alarms_OnAlarm_Dev callback, void* user_data))&Pnacl_M33_PPB_Alarms_Dev_AddOnAlarmListener
 };
 
-struct PPB_AudioInput_Dev_0_2 Pnacl_Wrappers_PPB_AudioInput_Dev_0_2 = {
-    .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M19_PPB_AudioInput_Dev_Create,
-    .IsAudioInput = (PP_Bool (*)(PP_Resource resource))&Pnacl_M19_PPB_AudioInput_Dev_IsAudioInput,
-    .EnumerateDevices = (int32_t (*)(PP_Resource audio_input, PP_Resource* devices, struct PP_CompletionCallback callback))&Pnacl_M19_PPB_AudioInput_Dev_EnumerateDevices,
-    .Open = (int32_t (*)(PP_Resource audio_input, PP_Resource device_ref, PP_Resource config, PPB_AudioInput_Callback_0_2 audio_input_callback, void* user_data, struct PP_CompletionCallback callback))&Pnacl_M19_PPB_AudioInput_Dev_Open,
-    .GetCurrentConfig = (PP_Resource (*)(PP_Resource audio_input))&Pnacl_M19_PPB_AudioInput_Dev_GetCurrentConfig,
-    .StartCapture = (PP_Bool (*)(PP_Resource audio_input))&Pnacl_M19_PPB_AudioInput_Dev_StartCapture,
-    .StopCapture = (PP_Bool (*)(PP_Resource audio_input))&Pnacl_M19_PPB_AudioInput_Dev_StopCapture,
-    .Close = (void (*)(PP_Resource audio_input))&Pnacl_M19_PPB_AudioInput_Dev_Close
-};
-
 struct PPB_AudioInput_Dev_0_3 Pnacl_Wrappers_PPB_AudioInput_Dev_0_3 = {
     .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M25_PPB_AudioInput_Dev_Create,
     .IsAudioInput = (PP_Bool (*)(PP_Resource resource))&Pnacl_M25_PPB_AudioInput_Dev_IsAudioInput,
     .EnumerateDevices = (int32_t (*)(PP_Resource audio_input, struct PP_ArrayOutput output, struct PP_CompletionCallback callback))&Pnacl_M25_PPB_AudioInput_Dev_EnumerateDevices,
     .MonitorDeviceChange = (int32_t (*)(PP_Resource audio_input, PP_MonitorDeviceChangeCallback callback, void* user_data))&Pnacl_M25_PPB_AudioInput_Dev_MonitorDeviceChange,
-    .Open = (int32_t (*)(PP_Resource audio_input, PP_Resource device_ref, PP_Resource config, PPB_AudioInput_Callback_0_2 audio_input_callback, void* user_data, struct PP_CompletionCallback callback))&Pnacl_M25_PPB_AudioInput_Dev_Open,
+    .Open = (int32_t (*)(PP_Resource audio_input, PP_Resource device_ref, PP_Resource config, PPB_AudioInput_Callback_0_3 audio_input_callback, void* user_data, struct PP_CompletionCallback callback))&Pnacl_M25_PPB_AudioInput_Dev_Open,
     .GetCurrentConfig = (PP_Resource (*)(PP_Resource audio_input))&Pnacl_M25_PPB_AudioInput_Dev_GetCurrentConfig,
     .StartCapture = (PP_Bool (*)(PP_Resource audio_input))&Pnacl_M25_PPB_AudioInput_Dev_StartCapture,
     .StopCapture = (PP_Bool (*)(PP_Resource audio_input))&Pnacl_M25_PPB_AudioInput_Dev_StopCapture,
@@ -4697,17 +4596,6 @@ struct PPB_VarResource_Dev_0_1 Pnacl_Wrappers_PPB_VarResource_Dev_0_1 = {
     .VarFromResource = (struct PP_Var (*)(PP_Resource resource))&Pnacl_M32_PPB_VarResource_Dev_VarFromResource
 };
 
-struct PPB_VideoCapture_Dev_0_2 Pnacl_Wrappers_PPB_VideoCapture_Dev_0_2 = {
-    .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M19_PPB_VideoCapture_Dev_Create,
-    .IsVideoCapture = (PP_Bool (*)(PP_Resource video_capture))&Pnacl_M19_PPB_VideoCapture_Dev_IsVideoCapture,
-    .EnumerateDevices = (int32_t (*)(PP_Resource video_capture, PP_Resource* devices, struct PP_CompletionCallback callback))&Pnacl_M19_PPB_VideoCapture_Dev_EnumerateDevices,
-    .Open = (int32_t (*)(PP_Resource video_capture, PP_Resource device_ref, const struct PP_VideoCaptureDeviceInfo_Dev* requested_info, uint32_t buffer_count, struct PP_CompletionCallback callback))&Pnacl_M19_PPB_VideoCapture_Dev_Open,
-    .StartCapture = (int32_t (*)(PP_Resource video_capture))&Pnacl_M19_PPB_VideoCapture_Dev_StartCapture,
-    .ReuseBuffer = (int32_t (*)(PP_Resource video_capture, uint32_t buffer))&Pnacl_M19_PPB_VideoCapture_Dev_ReuseBuffer,
-    .StopCapture = (int32_t (*)(PP_Resource video_capture))&Pnacl_M19_PPB_VideoCapture_Dev_StopCapture,
-    .Close = (void (*)(PP_Resource video_capture))&Pnacl_M19_PPB_VideoCapture_Dev_Close
-};
-
 struct PPB_VideoCapture_Dev_0_3 Pnacl_Wrappers_PPB_VideoCapture_Dev_0_3 = {
     .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M25_PPB_VideoCapture_Dev_Create,
     .IsVideoCapture = (PP_Bool (*)(PP_Resource video_capture))&Pnacl_M25_PPB_VideoCapture_Dev_IsVideoCapture,
@@ -5440,12 +5328,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Alarms_Dev_0_1 = {
   .real_iface = NULL
 };
 
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2 = {
-  .iface_macro = PPB_AUDIO_INPUT_DEV_INTERFACE_0_2,
-  .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_AudioInput_Dev_0_2,
-  .real_iface = NULL
-};
-
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3 = {
   .iface_macro = PPB_AUDIO_INPUT_DEV_INTERFACE_0_3,
   .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_AudioInput_Dev_0_3,
@@ -5536,12 +5418,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarResource_Dev_0_1 = {
   .real_iface = NULL
 };
 
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2 = {
-  .iface_macro = PPB_VIDEOCAPTURE_DEV_INTERFACE_0_2,
-  .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_VideoCapture_Dev_0_2,
-  .real_iface = NULL
-};
-
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_3 = {
   .iface_macro = PPB_VIDEOCAPTURE_DEV_INTERFACE_0_3,
   .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_VideoCapture_Dev_0_3,
@@ -5852,7 +5728,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
   &Pnacl_WrapperInfo_PPB_VarDictionary_1_0,
   &Pnacl_WrapperInfo_PPB_WebSocket_1_0,
   &Pnacl_WrapperInfo_PPB_Alarms_Dev_0_1,
-  &Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_2,
   &Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3,
   &Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_4,
   &Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1,
@@ -5868,7 +5743,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
   &Pnacl_WrapperInfo_PPB_URLUtil_Dev_0_6,
   &Pnacl_WrapperInfo_PPB_URLUtil_Dev_0_7,
   &Pnacl_WrapperInfo_PPB_VarResource_Dev_0_1,
-  &Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2,
   &Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_3,
   &Pnacl_WrapperInfo_PPB_VideoDecoder_Dev_0_16,
   &Pnacl_WrapperInfo_PPB_ContentDecryptor_Private_0_9,
diff --git a/ppapi/proxy/audio_input_resource.cc b/ppapi/proxy/audio_input_resource.cc
index 7c29df5..0ae1831 100644
--- a/ppapi/proxy/audio_input_resource.cc
+++ b/ppapi/proxy/audio_input_resource.cc
@@ -29,7 +29,7 @@ AudioInputResource::AudioInputResource(
       open_state_(BEFORE_OPEN),
       capturing_(false),
       shared_memory_size_(0),
-      audio_input_callback_0_2_(NULL),
+      audio_input_callback_0_3_(NULL),
       audio_input_callback_(NULL),
       user_data_(NULL),
       enumeration_helper_(this),
@@ -52,12 +52,6 @@ void AudioInputResource::OnReplyReceived(
     PluginResource::OnReplyReceived(params, msg);
 }
 
-int32_t AudioInputResource::EnumerateDevices0_2(
-    PP_Resource* devices,
-    scoped_refptr<TrackedCallback> callback) {
-  return enumeration_helper_.EnumerateDevices0_2(devices, callback);
-}
-
 int32_t AudioInputResource::EnumerateDevices(
     const PP_ArrayOutput& output,
     scoped_refptr<TrackedCallback> callback) {
@@ -70,13 +64,13 @@ int32_t AudioInputResource::MonitorDeviceChange(
   return enumeration_helper_.MonitorDeviceChange(callback, user_data);
 }
 
-int32_t AudioInputResource::Open0_2(
+int32_t AudioInputResource::Open0_3(
     PP_Resource device_ref,
     PP_Resource config,
-    PPB_AudioInput_Callback_0_2 audio_input_callback_0_2,
+    PPB_AudioInput_Callback_0_3 audio_input_callback_0_3,
     void* user_data,
     scoped_refptr<TrackedCallback> callback) {
-  return CommonOpen(device_ref, config, audio_input_callback_0_2, NULL,
+  return CommonOpen(device_ref, config, audio_input_callback_0_3, NULL,
                     user_data, callback);
 }
 
@@ -207,7 +201,7 @@ void AudioInputResource::SetStreamInfo(
 
 void AudioInputResource::StartThread() {
   // Don't start the thread unless all our state is set up correctly.
-  if ((!audio_input_callback_0_2_ && !audio_input_callback_) ||
+  if ((!audio_input_callback_0_3_ && !audio_input_callback_) ||
       !socket_.get() || !capturing_ || !shared_memory_->memory()) {
     return;
   }
@@ -249,7 +243,7 @@ void AudioInputResource::Run() {
         audio_input_callback_(&buffer->audio[0], buffer->params.size, latency,
                               user_data_);
       } else {
-        audio_input_callback_0_2_(&buffer->audio[0], buffer->params.size,
+        audio_input_callback_0_3_(&buffer->audio[0], buffer->params.size,
                                   user_data_);
       }
     }
@@ -259,7 +253,7 @@ void AudioInputResource::Run() {
 int32_t AudioInputResource::CommonOpen(
     PP_Resource device_ref,
     PP_Resource config,
-    PPB_AudioInput_Callback_0_2 audio_input_callback_0_2,
+    PPB_AudioInput_Callback_0_3 audio_input_callback_0_3,
     PPB_AudioInput_Callback audio_input_callback,
     void* user_data,
     scoped_refptr<TrackedCallback> callback) {
@@ -279,7 +273,7 @@ int32_t AudioInputResource::CommonOpen(
   if (open_state_ != BEFORE_OPEN)
     return PP_ERROR_FAILED;
 
-  if (!audio_input_callback_0_2 && !audio_input_callback)
+  if (!audio_input_callback_0_3 && !audio_input_callback)
     return PP_ERROR_BADARGUMENT;
   thunk::EnterResourceNoLock<thunk::PPB_AudioConfig_API> enter_config(config,
                                                                       true);
@@ -287,7 +281,7 @@ int32_t AudioInputResource::CommonOpen(
     return PP_ERROR_BADARGUMENT;
 
   config_ = config;
-  audio_input_callback_0_2_ = audio_input_callback_0_2;
+  audio_input_callback_0_3_ = audio_input_callback_0_3;
   audio_input_callback_ = audio_input_callback;
   user_data_ = user_data;
   open_callback_ = callback;
diff --git a/ppapi/proxy/audio_input_resource.h b/ppapi/proxy/audio_input_resource.h
index 84785d0..e4d0e73 100644
--- a/ppapi/proxy/audio_input_resource.h
+++ b/ppapi/proxy/audio_input_resource.h
@@ -35,18 +35,15 @@ class AudioInputResource : public PluginResource,
                                const IPC::Message& msg) OVERRIDE;
 
   // PPB_AudioInput_API implementation.
-  virtual int32_t EnumerateDevices0_2(
-      PP_Resource* devices,
-      scoped_refptr<TrackedCallback> callback) OVERRIDE;
   virtual int32_t EnumerateDevices(
       const PP_ArrayOutput& output,
       scoped_refptr<TrackedCallback> callback) OVERRIDE;
   virtual int32_t MonitorDeviceChange(
       PP_MonitorDeviceChangeCallback callback,
       void* user_data) OVERRIDE;
-  virtual int32_t Open0_2(PP_Resource device_ref,
+  virtual int32_t Open0_3(PP_Resource device_ref,
                           PP_Resource config,
-                          PPB_AudioInput_Callback_0_2 audio_input_callback_0_2,
+                          PPB_AudioInput_Callback_0_3 audio_input_callback_0_3,
                           void* user_data,
                           scoped_refptr<TrackedCallback> callback) OVERRIDE;
   virtual int32_t Open(PP_Resource device_ref,
@@ -90,7 +87,7 @@ class AudioInputResource : public PluginResource,
 
   int32_t CommonOpen(PP_Resource device_ref,
                      PP_Resource config,
-                     PPB_AudioInput_Callback_0_2 audio_input_callback_0_2,
+                     PPB_AudioInput_Callback_0_3 audio_input_callback_0_3,
                      PPB_AudioInput_Callback audio_input_callback,
                      void* user_data,
                      scoped_refptr<TrackedCallback> callback);
@@ -116,7 +113,7 @@ class AudioInputResource : public PluginResource,
   scoped_ptr<base::DelegateSimpleThread> audio_input_thread_;
 
   // Callback to call when new samples are available.
-  PPB_AudioInput_Callback_0_2 audio_input_callback_0_2_;
+  PPB_AudioInput_Callback_0_3 audio_input_callback_0_3_;
   PPB_AudioInput_Callback audio_input_callback_;
 
   // User data pointer passed verbatim to the callback function.
diff --git a/ppapi/proxy/device_enumeration_resource_helper.cc b/ppapi/proxy/device_enumeration_resource_helper.cc
index e8d63e1..7495ec3 100644
--- a/ppapi/proxy/device_enumeration_resource_helper.cc
+++ b/ppapi/proxy/device_enumeration_resource_helper.cc
@@ -36,24 +36,6 @@ DeviceEnumerationResourceHelper::DeviceEnumerationResourceHelper(
 DeviceEnumerationResourceHelper::~DeviceEnumerationResourceHelper() {
 }
 
-int32_t DeviceEnumerationResourceHelper::EnumerateDevices0_2(
-    PP_Resource* devices,
-    scoped_refptr<TrackedCallback> callback) {
-  if (pending_enumerate_devices_)
-    return PP_ERROR_INPROGRESS;
-  if (!devices)
-    return PP_ERROR_BADARGUMENT;
-
-  pending_enumerate_devices_ = true;
-  PpapiHostMsg_DeviceEnumeration_EnumerateDevices msg;
-  owner_->Call<PpapiPluginMsg_DeviceEnumeration_EnumerateDevicesReply>(
-      PluginResource::RENDERER, msg,
-      base::Bind(
-          &DeviceEnumerationResourceHelper::OnPluginMsgEnumerateDevicesReply0_2,
-          AsWeakPtr(), devices, callback));
-  return PP_OK_COMPLETIONPENDING;
-}
-
 int32_t DeviceEnumerationResourceHelper::EnumerateDevices(
     const PP_ArrayOutput& output,
     scoped_refptr<TrackedCallback> callback) {
@@ -132,27 +114,6 @@ void DeviceEnumerationResourceHelper::LastPluginRefWasDeleted() {
   // that properly.
 }
 
-void DeviceEnumerationResourceHelper::OnPluginMsgEnumerateDevicesReply0_2(
-    PP_Resource* devices_resource,
-    scoped_refptr<TrackedCallback> callback,
-    const ResourceMessageReplyParams& params,
-    const std::vector<DeviceRefData>& devices) {
-  pending_enumerate_devices_ = false;
-
-  // We shouldn't access |devices_resource| if the callback has been called,
-  // which is possible if the last plugin reference to the corresponding
-  // resource has gone away, and the callback has been aborted.
-  if (!TrackedCallback::IsPending(callback))
-    return;
-
-  if (params.result() == PP_OK) {
-    *devices_resource = PPB_DeviceRef_Shared::CreateResourceArray(
-        OBJECT_IS_PROXY, owner_->pp_instance(), devices);
-  }
-
-  callback->Run(params.result());
-}
-
 void DeviceEnumerationResourceHelper::OnPluginMsgEnumerateDevicesReply(
     const PP_ArrayOutput& output,
     scoped_refptr<TrackedCallback> callback,
diff --git a/ppapi/proxy/device_enumeration_resource_helper.h b/ppapi/proxy/device_enumeration_resource_helper.h
index a2574ec..cea3153 100644
--- a/ppapi/proxy/device_enumeration_resource_helper.h
+++ b/ppapi/proxy/device_enumeration_resource_helper.h
@@ -37,8 +37,6 @@ class PPAPI_PROXY_EXPORT DeviceEnumerationResourceHelper
   explicit DeviceEnumerationResourceHelper(PluginResource* owner);
   ~DeviceEnumerationResourceHelper();
 
-  int32_t EnumerateDevices0_2(PP_Resource* devices,
-                              scoped_refptr<TrackedCallback> callback);
   int32_t EnumerateDevices(const PP_ArrayOutput& output,
                            scoped_refptr<TrackedCallback> callback);
   int32_t EnumerateDevicesSync(const PP_ArrayOutput& output);
@@ -52,11 +50,6 @@ class PPAPI_PROXY_EXPORT DeviceEnumerationResourceHelper
   void LastPluginRefWasDeleted();
 
  private:
-  void OnPluginMsgEnumerateDevicesReply0_2(
-      PP_Resource* devices_resource,
-      scoped_refptr<TrackedCallback> callback,
-      const ResourceMessageReplyParams& params,
-      const std::vector<DeviceRefData>& devices);
   void OnPluginMsgEnumerateDevicesReply(
       const PP_ArrayOutput& output,
       scoped_refptr<TrackedCallback> callback,
diff --git a/ppapi/proxy/video_capture_resource.cc b/ppapi/proxy/video_capture_resource.cc
index 6ea8bd5..5ea6ca6 100644
--- a/ppapi/proxy/video_capture_resource.cc
+++ b/ppapi/proxy/video_capture_resource.cc
@@ -62,12 +62,6 @@ void VideoCaptureResource::OnReplyReceived(
   IPC_END_MESSAGE_MAP()
 }
 
-int32_t VideoCaptureResource::EnumerateDevices0_2(
-    PP_Resource* devices,
-    scoped_refptr<TrackedCallback> callback) {
-  return enumeration_helper_.EnumerateDevices0_2(devices, callback);
-}
-
 int32_t VideoCaptureResource::EnumerateDevices(
     const PP_ArrayOutput& output,
     scoped_refptr<TrackedCallback> callback) {
diff --git a/ppapi/proxy/video_capture_resource.h b/ppapi/proxy/video_capture_resource.h
index e533ef0..44e415e 100644
--- a/ppapi/proxy/video_capture_resource.h
+++ b/ppapi/proxy/video_capture_resource.h
@@ -29,9 +29,6 @@ class VideoCaptureResource
   }
 
   // PPB_VideoCapture_API implementation.
-  virtual int32_t EnumerateDevices0_2(
-      PP_Resource* devices,
-      scoped_refptr<TrackedCallback> callback) OVERRIDE;
   virtual int32_t EnumerateDevices(
       const PP_ArrayOutput& output,
       scoped_refptr<TrackedCallback> callback) OVERRIDE;
diff --git a/ppapi/shared_impl/ppb_device_ref_shared.cc b/ppapi/shared_impl/ppb_device_ref_shared.cc
index 4f9c14c..1b45873 100644
--- a/ppapi/shared_impl/ppb_device_ref_shared.cc
+++ b/ppapi/shared_impl/ppb_device_ref_shared.cc
@@ -4,10 +4,8 @@
 
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
 
-#include "base/memory/scoped_ptr.h"
 #include "ppapi/shared_impl/host_resource.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
-#include "ppapi/shared_impl/ppb_resource_array_shared.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/var.h"
 
@@ -42,29 +40,4 @@ PP_Var PPB_DeviceRef_Shared::GetName() {
   return StringVar::StringToPPVar(data_.name);
 }
 
-// static
-PP_Resource PPB_DeviceRef_Shared::CreateResourceArray(
-    ResourceObjectType type,
-    PP_Instance instance,
-    const std::vector<DeviceRefData>& devices) {
-  scoped_ptr<PP_Resource[]> elements;
-  size_t size = devices.size();
-  if (size > 0) {
-    elements.reset(new PP_Resource[size]);
-    for (size_t index = 0; index < size; ++index) {
-      PPB_DeviceRef_Shared* device_object =
-          new PPB_DeviceRef_Shared(type, instance, devices[index]);
-      elements[index] = device_object->GetReference();
-    }
-  }
-  PPB_ResourceArray_Shared* array_object =
-      new PPB_ResourceArray_Shared(type, instance, elements.get(),
-                                   static_cast<uint32_t>(size));
-
-  for (size_t index = 0; index < size; ++index)
-    PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(elements[index]);
-
-  return array_object->GetReference();
-}
-
 }  // namespace ppapi
diff --git a/ppapi/shared_impl/ppb_device_ref_shared.h b/ppapi/shared_impl/ppb_device_ref_shared.h
index 9ea367e..792eb45 100644
--- a/ppapi/shared_impl/ppb_device_ref_shared.h
+++ b/ppapi/shared_impl/ppb_device_ref_shared.h
@@ -6,7 +6,6 @@
 #define PPAPI_SHARED_IMPL_PPB_DEVICE_REF_SHARED_H_
 
 #include <string>
-#include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -48,11 +47,6 @@ class PPAPI_SHARED_EXPORT PPB_DeviceRef_Shared
   virtual PP_DeviceType_Dev GetType() OVERRIDE;
   virtual PP_Var GetName() OVERRIDE;
 
-  static PP_Resource CreateResourceArray(
-      ResourceObjectType type,
-      PP_Instance instance,
-      const std::vector<DeviceRefData>& devices);
-
  private:
   DeviceRefData data_;
 
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index edaa9e1..4e30407 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -37,7 +37,6 @@ UNPROXIED_API(PPB_Scrollbar)
 PROXIED_API(PPB_VideoDecoder)
 UNPROXIED_API(PPB_Widget)
 
-PROXIED_IFACE(PPB_AUDIO_INPUT_DEV_INTERFACE_0_2, PPB_AudioInput_Dev_0_2)
 PROXIED_IFACE(PPB_AUDIO_INPUT_DEV_INTERFACE_0_3, PPB_AudioInput_Dev_0_3)
 PROXIED_IFACE(PPB_AUDIO_INPUT_DEV_INTERFACE_0_4, PPB_AudioInput_Dev_0_4)
 PROXIED_IFACE(PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1, PPB_IMEInputEvent_Dev_0_1)
@@ -53,7 +52,6 @@ PROXIED_IFACE(PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev_0_6)
 PROXIED_IFACE(PPB_URLUTIL_DEV_INTERFACE_0_7, PPB_URLUtil_Dev_0_7)
 UNPROXIED_IFACE(PPB_SCROLLBAR_DEV_INTERFACE_0_5, PPB_Scrollbar_Dev_0_5)
 PROXIED_IFACE(PPB_TEXTINPUT_DEV_INTERFACE_0_1, PPB_TextInput_Dev_0_1)
-PROXIED_IFACE(PPB_VIDEOCAPTURE_DEV_INTERFACE_0_2, PPB_VideoCapture_Dev_0_2)
 PROXIED_IFACE(PPB_VIDEOCAPTURE_DEV_INTERFACE_0_3, PPB_VideoCapture_Dev_0_3)
 PROXIED_IFACE(PPB_VIDEODECODER_DEV_INTERFACE_0_16, PPB_VideoDecoder_Dev_0_16)
 UNPROXIED_IFACE(PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev_0_3)
diff --git a/ppapi/thunk/ppb_audio_input_api.h b/ppapi/thunk/ppb_audio_input_api.h
index 60fc881..706417e 100644
--- a/ppapi/thunk/ppb_audio_input_api.h
+++ b/ppapi/thunk/ppb_audio_input_api.h
@@ -20,16 +20,13 @@ class PPB_AudioInput_API {
  public:
   virtual ~PPB_AudioInput_API() {}
 
-  virtual int32_t EnumerateDevices0_2(
-      PP_Resource* devices,
-      scoped_refptr<TrackedCallback> callback) = 0;
   virtual int32_t EnumerateDevices(const PP_ArrayOutput& output,
                                    scoped_refptr<TrackedCallback> callback) = 0;
   virtual int32_t MonitorDeviceChange(PP_MonitorDeviceChangeCallback callback,
                                       void* user_data) = 0;
-  virtual int32_t Open0_2(PP_Resource device_ref,
+  virtual int32_t Open0_3(PP_Resource device_ref,
                           PP_Resource config,
-                          PPB_AudioInput_Callback_0_2 audio_input_callback_0_2,
+                          PPB_AudioInput_Callback_0_3 audio_input_callback_0_3,
                           void* user_data,
                           scoped_refptr<TrackedCallback> callback) = 0;
   virtual int32_t Open(PP_Resource device_ref,
diff --git a/ppapi/thunk/ppb_audio_input_dev_thunk.cc b/ppapi/thunk/ppb_audio_input_dev_thunk.cc
index ee38c7a..7d44a03 100644
--- a/ppapi/thunk/ppb_audio_input_dev_thunk.cc
+++ b/ppapi/thunk/ppb_audio_input_dev_thunk.cc
@@ -31,18 +31,6 @@ PP_Bool IsAudioInput(PP_Resource resource) {
   return PP_FromBool(enter.succeeded());
 }
 
-int32_t EnumerateDevices_0_2(PP_Resource audio_input,
-                             PP_Resource* devices,
-                             struct PP_CompletionCallback callback) {
-  VLOG(4) << "PPB_AudioInput_Dev::EnumerateDevices()";
-  EnterResource<PPB_AudioInput_API> enter(audio_input, callback, true);
-  if (enter.failed())
-    return enter.retval();
-  return enter.SetResult(enter.object()->EnumerateDevices0_2(
-      devices,
-      enter.callback()));
-}
-
 int32_t EnumerateDevices(PP_Resource audio_input,
                          struct PP_ArrayOutput output,
                          struct PP_CompletionCallback callback) {
@@ -64,17 +52,17 @@ int32_t MonitorDeviceChange(PP_Resource audio_input,
   return enter.object()->MonitorDeviceChange(callback, user_data);
 }
 
-int32_t Open_0_2(PP_Resource audio_input,
+int32_t Open_0_3(PP_Resource audio_input,
                  PP_Resource device_ref,
                  PP_Resource config,
-                 PPB_AudioInput_Callback_0_2 audio_input_callback,
+                 PPB_AudioInput_Callback_0_3 audio_input_callback,
                  void* user_data,
                  struct PP_CompletionCallback callback) {
   VLOG(4) << "PPB_AudioInput_Dev::Open()";
   EnterResource<PPB_AudioInput_API> enter(audio_input, callback, true);
   if (enter.failed())
     return enter.retval();
-  return enter.SetResult(enter.object()->Open0_2(device_ref,
+  return enter.SetResult(enter.object()->Open0_3(device_ref,
                                                  config,
                                                  audio_input_callback,
                                                  user_data,
@@ -130,23 +118,12 @@ void Close(PP_Resource audio_input) {
   enter.object()->Close();
 }
 
-const PPB_AudioInput_Dev_0_2 g_ppb_audioinput_dev_thunk_0_2 = {
-  &Create,
-  &IsAudioInput,
-  &EnumerateDevices_0_2,
-  &Open_0_2,
-  &GetCurrentConfig,
-  &StartCapture,
-  &StopCapture,
-  &Close
-};
-
 const PPB_AudioInput_Dev_0_3 g_ppb_audioinput_dev_thunk_0_3 = {
   &Create,
   &IsAudioInput,
   &EnumerateDevices,
   &MonitorDeviceChange,
-  &Open_0_2,
+  &Open_0_3,
   &GetCurrentConfig,
   &StartCapture,
   &StopCapture,
@@ -167,10 +144,6 @@ const PPB_AudioInput_Dev_0_4 g_ppb_audioinput_dev_thunk_0_4 = {
 
 }  // namespace
 
-const PPB_AudioInput_Dev_0_2* GetPPB_AudioInput_Dev_0_2_Thunk() {
-  return &g_ppb_audioinput_dev_thunk_0_2;
-}
-
 const PPB_AudioInput_Dev_0_3* GetPPB_AudioInput_Dev_0_3_Thunk() {
   return &g_ppb_audioinput_dev_thunk_0_3;
 }
diff --git a/ppapi/thunk/ppb_video_capture_api.h b/ppapi/thunk/ppb_video_capture_api.h
index baa7e00..2c0089e 100644
--- a/ppapi/thunk/ppb_video_capture_api.h
+++ b/ppapi/thunk/ppb_video_capture_api.h
@@ -23,9 +23,6 @@ class PPB_VideoCapture_API {
  public:
   virtual ~PPB_VideoCapture_API() {}
 
-  virtual int32_t EnumerateDevices0_2(
-      PP_Resource* devices,
-      scoped_refptr<TrackedCallback> callback) = 0;
   virtual int32_t EnumerateDevices(const PP_ArrayOutput& output,
                                    scoped_refptr<TrackedCallback> callback) = 0;
   virtual int32_t MonitorDeviceChange(PP_MonitorDeviceChangeCallback callback,
diff --git a/ppapi/thunk/ppb_video_capture_thunk.cc b/ppapi/thunk/ppb_video_capture_thunk.cc
index 9d6571e..83772a5 100644
--- a/ppapi/thunk/ppb_video_capture_thunk.cc
+++ b/ppapi/thunk/ppb_video_capture_thunk.cc
@@ -30,17 +30,6 @@ PP_Bool IsVideoCapture(PP_Resource resource) {
   return PP_FromBool(enter.succeeded());
 }
 
-int32_t EnumerateDevices0_2(PP_Resource video_capture,
-                            PP_Resource* devices,
-                            PP_CompletionCallback callback) {
-  EnterVideoCapture enter(video_capture, callback, true);
-  if (enter.failed())
-    return enter.retval();
-
-  return enter.SetResult(enter.object()->EnumerateDevices0_2(devices,
-                                                             enter.callback()));
-}
-
 int32_t EnumerateDevices(PP_Resource video_capture,
                          PP_ArrayOutput output,
                          PP_CompletionCallback callback) {
@@ -112,17 +101,6 @@ void Close(PP_Resource video_capture) {
     enter.object()->Close();
 }
 
-const PPB_VideoCapture_Dev_0_2 g_ppb_video_capture_0_2_thunk = {
-  &Create,
-  &IsVideoCapture,
-  &EnumerateDevices0_2,
-  &Open,
-  &StartCapture,
-  &ReuseBuffer,
-  &StopCapture,
-  &Close
-};
-
 const PPB_VideoCapture_Dev_0_3 g_ppb_video_capture_0_3_thunk = {
   &Create,
   &IsVideoCapture,
@@ -137,10 +115,6 @@ const PPB_VideoCapture_Dev_0_3 g_ppb_video_capture_0_3_thunk = {
 
 }  // namespace
 
-const PPB_VideoCapture_Dev_0_2* GetPPB_VideoCapture_Dev_0_2_Thunk() {
-  return &g_ppb_video_capture_0_2_thunk;
-}
-
 const PPB_VideoCapture_Dev_0_3* GetPPB_VideoCapture_Dev_0_3_Thunk() {
   return &g_ppb_video_capture_0_3_thunk;
 }