Pull latest Pepper to get moved audio, video, and char set interfaces, now

called "dev." This also marks un-flaky the image data test which I think I
fixed.

BUG=51344
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/3243007

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

13 files changed, 66 insertions, 61 deletions

diff --git a/DEPS b/DEPS
index c07a58c..ec29dd2 100644
--- a/DEPS
+++ b/DEPS
@@ -163,7 +163,7 @@ deps = {
     Var("libvpx_revision"),
 
   "src/third_party/ppapi":
-    "http://ppapi.googlecode.com/svn/trunk@212",
+    "http://ppapi.googlecode.com/svn/trunk@215",
 
   "src/third_party/libjingle/source":
     "http://libjingle.googlecode.com/svn/branches/nextsnap@" +
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc
index e56e873..8ccaed4 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -14,6 +14,7 @@
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
+#include "third_party/ppapi/c/dev/pp_video_dev.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserCompletion.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
@@ -394,7 +395,7 @@ class PlatformVideoDecoderImpl
     memset(&flush_callback_, 0, sizeof(flush_callback_));
   }
 
-  virtual bool Init(const PP_VideoDecoderConfig& decoder_config) {
+  virtual bool Init(const PP_VideoDecoderConfig_Dev& decoder_config) {
     decoder_config_ = decoder_config;
     input_buffer_size_ = 1024 << 4;
 
@@ -409,7 +410,7 @@ class PlatformVideoDecoderImpl
     return true;
   }
 
-  virtual bool Decode(PP_VideoCompressedDataBuffer& input_buffer) {
+  virtual bool Decode(PP_VideoCompressedDataBuffer_Dev& input_buffer) {
     // TODO(wjia): Implement me!
     NOTIMPLEMENTED();
 
@@ -436,7 +437,7 @@ class PlatformVideoDecoderImpl
   }
 
   virtual bool ReturnUncompressedDataBuffer(
-      PP_VideoUncompressedDataBuffer& buffer) {
+      PP_VideoUncompressedDataBuffer_Dev& buffer) {
     // TODO(wjia): Implement me!
     NOTIMPLEMENTED();
 
@@ -461,8 +462,8 @@ class PlatformVideoDecoderImpl
   size_t input_buffer_size_;
   int next_dib_id_;
   scoped_ptr<TransportDIB> dib_;
-  PP_VideoDecoderConfig decoder_config_;
-  std::queue<PP_VideoCompressedDataBuffer*> input_buffers_;
+  PP_VideoDecoderConfig_Dev decoder_config_;
+  std::queue<PP_VideoCompressedDataBuffer_Dev*> input_buffers_;
   PP_CompletionCallback flush_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformVideoDecoderImpl);
@@ -570,7 +571,7 @@ pepper::PluginDelegate::PlatformContext3D*
 
 pepper::PluginDelegate::PlatformVideoDecoder*
 PepperPluginDelegateImpl::CreateVideoDecoder(
-    const PP_VideoDecoderConfig& decoder_config) {
+    const PP_VideoDecoderConfig_Dev& decoder_config) {
   scoped_ptr<PlatformVideoDecoderImpl> decoder(new PlatformVideoDecoderImpl());
 
   if (!decoder->Init(decoder_config))
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.h b/chrome/renderer/pepper_plugin_delegate_impl.h
index 9fce915..1930fa8 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.h
+++ b/chrome/renderer/pepper_plugin_delegate_impl.h
@@ -11,7 +11,6 @@
 #include "base/basictypes.h"
 #include "base/weak_ptr.h"
 #include "third_party/ppapi/c/pp_errors.h"
-#include "third_party/ppapi/c/pp_video.h"
 #include "webkit/glue/plugins/pepper_plugin_delegate.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 
@@ -48,7 +47,7 @@ class PepperPluginDelegateImpl
   virtual PlatformImage2D* CreateImage2D(int width, int height);
   virtual PlatformContext3D* CreateContext3D();
   virtual PlatformVideoDecoder* CreateVideoDecoder(
-      const PP_VideoDecoderConfig& decoder_config);
+      const PP_VideoDecoderConfig_Dev& decoder_config);
   virtual void DidChangeNumberOfFindResults(int identifier,
                                             int total,
                                             bool final_result);
diff --git a/webkit/glue/plugins/pepper_audio.cc b/webkit/glue/plugins/pepper_audio.cc
index 2fa13b7..98edb22 100644
--- a/webkit/glue/plugins/pepper_audio.cc
+++ b/webkit/glue/plugins/pepper_audio.cc
@@ -5,9 +5,8 @@
 #include "webkit/glue/plugins/pepper_audio.h"
 
 #include "base/logging.h"
-#include "third_party/ppapi/c/ppb_audio.h"
-#include "third_party/ppapi/c/ppb_audio_trusted.h"
-
+#include "third_party/ppapi/c/dev/ppb_audio_dev.h"
+#include "third_party/ppapi/c/dev/ppb_audio_trusted_dev.h"
 
 namespace pepper {
 
@@ -77,20 +76,20 @@ int GetOSDescriptor(PP_Resource audio_id) {
   return -1;
 }
 
-const PPB_AudioConfig ppb_audioconfig = {
+const PPB_AudioConfig_Dev ppb_audioconfig = {
   &CreateStereo16bit,
   &GetSampleRate,
   &GetSampleFrameCount
 };
 
-const PPB_Audio ppb_audio = {
+const PPB_Audio_Dev ppb_audio = {
   &Create,
   &GetCurrentConfiguration,
   &StartPlayback,
   &StopPlayback,
 };
 
-const PPB_AudioTrusted ppb_audiotrusted = {
+const PPB_AudioTrusted_Dev ppb_audiotrusted = {
   &GetBuffer,
   &GetOSDescriptor
 };
@@ -104,7 +103,7 @@ AudioConfig::AudioConfig(PluginModule* module, int32_t sample_rate,
       sample_frame_count_(sample_frame_count) {
 }
 
-const PPB_AudioConfig* AudioConfig::GetInterface() {
+const PPB_AudioConfig_Dev* AudioConfig::GetInterface() {
   return &ppb_audioconfig;
 }
 
@@ -134,11 +133,11 @@ Audio::~Audio() {
 }
 
 
-const PPB_Audio* Audio::GetInterface() {
+const PPB_Audio_Dev* Audio::GetInterface() {
   return &ppb_audio;
 }
 
-const PPB_AudioTrusted* Audio::GetTrustedInterface() {
+const PPB_AudioTrusted_Dev* Audio::GetTrustedInterface() {
   return &ppb_audiotrusted;
 }
 
diff --git a/webkit/glue/plugins/pepper_audio.h b/webkit/glue/plugins/pepper_audio.h
index 2164f00..d6a175b 100644
--- a/webkit/glue/plugins/pepper_audio.h
+++ b/webkit/glue/plugins/pepper_audio.h
@@ -7,9 +7,9 @@
 #include "base/shared_memory.h"
 #include "base/simple_thread.h"
 #include "base/sync_socket.h"
-#include "third_party/ppapi/c/ppb_audio.h"
-#include "third_party/ppapi/c/ppb_audio_config.h"
-#include "third_party/ppapi/c/ppb_audio_trusted.h"
+#include "third_party/ppapi/c/dev/ppb_audio_dev.h"
+#include "third_party/ppapi/c/dev/ppb_audio_config_dev.h"
+#include "third_party/ppapi/c/dev/ppb_audio_trusted_dev.h"
 #include "webkit/glue/plugins/pepper_plugin_delegate.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 #include "webkit/glue/plugins/pepper_plugin_module.h"
@@ -28,7 +28,7 @@ class AudioConfig : public Resource {
   AudioConfig(PluginModule* module, int32_t sample_rate,
               int32_t sample_frame_count);
 
-  static const PPB_AudioConfig* GetInterface();
+  static const PPB_AudioConfig_Dev* GetInterface();
 
   uint32_t sample_rate() { return sample_rate_; }
   uint32_t sample_frame_count() { return sample_frame_count_; }
@@ -48,8 +48,8 @@ class Audio : public Resource,
   explicit Audio(PluginModule* module);
   virtual ~Audio();
 
-  static const PPB_Audio* GetInterface();
-  static const PPB_AudioTrusted* GetTrustedInterface();
+  static const PPB_Audio_Dev* GetInterface();
+  static const PPB_AudioTrusted_Dev* GetTrustedInterface();
 
   bool Init(PluginDelegate* plugin_delegate, PP_Resource config_id,
             PPB_Audio_Callback callback, void* user_data);
diff --git a/webkit/glue/plugins/pepper_char_set.cc b/webkit/glue/plugins/pepper_char_set.cc
index c23c34b..3e6a0b2 100644
--- a/webkit/glue/plugins/pepper_char_set.cc
+++ b/webkit/glue/plugins/pepper_char_set.cc
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 #include "base/i18n/icu_string_conversions.h"
-#include "third_party/ppapi/c/ppb_char_set.h"
+#include "third_party/ppapi/c/dev/ppb_char_set_dev.h"
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_cb.h"
 #include "unicode/ucnv_err.h"
@@ -141,7 +141,7 @@ PP_Var GetDefaultCodePageForUILanguage() {
   return PP_MakeVoid();
 }
 
-const PPB_CharSetDev ppb_charset = {
+const PPB_CharSet_Dev ppb_charset = {
   &UTF16ToCharSet,
   &CharSetToUTF16,
   &GetDefaultCodePageForUILanguage
@@ -150,7 +150,7 @@ const PPB_CharSetDev ppb_charset = {
 }  // namespace
 
 // static
-const PPB_CharSetDev* CharSet::GetInterface() {
+const struct PPB_CharSet_Dev* CharSet::GetInterface() {
   return &ppb_charset;
 }
 
diff --git a/webkit/glue/plugins/pepper_char_set.h b/webkit/glue/plugins/pepper_char_set.h
index 9564527..5abb54d 100644
--- a/webkit/glue/plugins/pepper_char_set.h
+++ b/webkit/glue/plugins/pepper_char_set.h
@@ -5,7 +5,7 @@
 #ifndef WEBKIT_GLUE_PLUGINS_PEPPER_CHAR_SET_H_
 #define WEBKIT_GLUE_PLUGINS_PEPPER_CHAR_SET_H_
 
-typedef struct _ppb_CharSetDev PPB_CharSetDev;
+struct PPB_CharSet_Dev;
 
 namespace pepper {
 
@@ -13,7 +13,7 @@ class CharSet {
  public:
   // Returns a pointer to the interface implementing PPB_CharSet that is
   // exposed to the plugin.
-  static const PPB_CharSetDev* GetInterface();
+  static const PPB_CharSet_Dev* GetInterface();
 };
 
 }  // namespace pepper
diff --git a/webkit/glue/plugins/pepper_plugin_delegate.h b/webkit/glue/plugins/pepper_plugin_delegate.h
index 5f5631083..876eb4a 100644
--- a/webkit/glue/plugins/pepper_plugin_delegate.h
+++ b/webkit/glue/plugins/pepper_plugin_delegate.h
@@ -11,7 +11,6 @@
 #include "third_party/ppapi/c/pp_completion_callback.h"
 #include "third_party/ppapi/c/pp_errors.h"
 #include "third_party/ppapi/c/pp_stdint.h"
-#include "third_party/ppapi/c/pp_video.h"
 
 class AudioMessageFilter;
 
@@ -32,6 +31,10 @@ class WebFileChooserCompletion;
 struct WebFileChooserParams;
 }
 
+struct PP_VideoCompressedDataBuffer_Dev;
+struct PP_VideoDecoderConfig_Dev;
+struct PP_VideoUncompressedDataBuffer_Dev;
+
 namespace pepper {
 
 class PluginInstance;
@@ -102,10 +105,10 @@ class PluginDelegate {
     virtual ~PlatformVideoDecoder() {}
 
     // Returns false on failure.
-    virtual bool Decode(PP_VideoCompressedDataBuffer& input_buffer) = 0;
+    virtual bool Decode(PP_VideoCompressedDataBuffer_Dev& input_buffer) = 0;
     virtual int32_t Flush(PP_CompletionCallback& callback) = 0;
     virtual bool ReturnUncompressedDataBuffer(
-        PP_VideoUncompressedDataBuffer& buffer) = 0;
+        PP_VideoUncompressedDataBuffer_Dev& buffer) = 0;
   };
 
   // Indicates that the given instance has been created.
@@ -124,7 +127,7 @@ class PluginDelegate {
 
   // The caller will own the pointer returned from this.
   virtual PlatformVideoDecoder* CreateVideoDecoder(
-      const PP_VideoDecoderConfig& decoder_config) = 0;
+      const PP_VideoDecoderConfig_Dev& decoder_config) = 0;
 
   // The caller will own the pointer returned from this.
   virtual PlatformAudio* CreateAudio(uint32_t sample_rate,
diff --git a/webkit/glue/plugins/pepper_plugin_instance.cc b/webkit/glue/plugins/pepper_plugin_instance.cc
index f22a1af..2b56394 100644
--- a/webkit/glue/plugins/pepper_plugin_instance.cc
+++ b/webkit/glue/plugins/pepper_plugin_instance.cc
@@ -322,7 +322,7 @@ bool PluginInstance::BindGraphicsDeviceContext(PP_Resource device_id) {
   return true;
 }
 
-bool PluginInstance::SetCursor(PP_CursorType type) {
+bool PluginInstance::SetCursor(PP_CursorType_Dev type) {
   cursor_.reset(new WebCursorInfo(static_cast<WebCursorInfo::Type>(type)));
   return true;
 }
diff --git a/webkit/glue/plugins/pepper_plugin_instance.h b/webkit/glue/plugins/pepper_plugin_instance.h
index 8a09cdf..6c3b674 100644
--- a/webkit/glue/plugins/pepper_plugin_instance.h
+++ b/webkit/glue/plugins/pepper_plugin_instance.h
@@ -13,7 +13,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "gfx/rect.h"
-#include "third_party/ppapi/c/pp_cursor_type.h"
+#include "third_party/ppapi/c/dev/pp_cursor_type_dev.h"
 #include "third_party/ppapi/c/pp_instance.h"
 #include "third_party/ppapi/c/pp_resource.h"
 #include "third_party/ppapi/c/ppp_printing.h"
@@ -92,7 +92,7 @@ class PluginInstance : public base::RefCounted<PluginInstance> {
   PP_Var GetOwnerElementObject();
   bool BindGraphicsDeviceContext(PP_Resource device_id);
   bool full_frame() const { return full_frame_; }
-  bool SetCursor(PP_CursorType type);
+  bool SetCursor(PP_CursorType_Dev type);
 
   // PPP_Instance pass-through.
   void Delete();
diff --git a/webkit/glue/plugins/pepper_plugin_module.cc b/webkit/glue/plugins/pepper_plugin_module.cc
index 6af71dc..39df9cf 100644
--- a/webkit/glue/plugins/pepper_plugin_module.cc
+++ b/webkit/glue/plugins/pepper_plugin_module.cc
@@ -12,8 +12,9 @@
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
+#include "third_party/ppapi/c/dev/ppb_char_set_dev.h"
+#include "third_party/ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "third_party/ppapi/c/ppb_buffer.h"
-#include "third_party/ppapi/c/ppb_char_set.h"
 #include "third_party/ppapi/c/ppb_core.h"
 #include "third_party/ppapi/c/ppb_device_context_2d.h"
 #include "third_party/ppapi/c/ppb_file_io.h"
@@ -31,7 +32,6 @@
 #include "third_party/ppapi/c/ppb_url_response_info.h"
 #include "third_party/ppapi/c/ppb_url_util.h"
 #include "third_party/ppapi/c/ppb_var.h"
-#include "third_party/ppapi/c/ppb_video_decoder.h"
 #include "third_party/ppapi/c/ppb_widget.h"
 #include "third_party/ppapi/c/ppp.h"
 #include "third_party/ppapi/c/ppp_instance.h"
@@ -174,11 +174,11 @@ const void* GetInterface(const char* name) {
     return PluginInstance::GetInterface();
   if (strcmp(name, PPB_IMAGEDATA_INTERFACE) == 0)
     return ImageData::GetInterface();
-  if (strcmp(name, PPB_AUDIO_CONFIG_INTERFACE) == 0)
+  if (strcmp(name, PPB_AUDIO_CONFIG_DEV_INTERFACE) == 0)
     return AudioConfig::GetInterface();
-  if (strcmp(name, PPB_AUDIO_INTERFACE) == 0)
+  if (strcmp(name, PPB_AUDIO_DEV_INTERFACE) == 0)
     return Audio::GetInterface();
-  if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE) == 0)
+  if (strcmp(name, PPB_AUDIO_TRUSTED_DEV_INTERFACE) == 0)
     return Audio::GetTrustedInterface();
   if (strcmp(name, PPB_DEVICECONTEXT2D_INTERFACE) == 0)
     return DeviceContext2D::GetInterface();
@@ -220,9 +220,9 @@ const void* GetInterface(const char* name) {
     return Private::GetInterface();
   if (strcmp(name, PPB_FILECHOOSER_INTERFACE) == 0)
     return FileChooser::GetInterface();
-  if (strcmp(name, PPB_VIDEODECODER_INTERFACE) == 0)
+  if (strcmp(name, PPB_VIDEODECODER_DEV_INTERFACE) == 0)
     return VideoDecoder::GetInterface();
-  if (strcmp(name, PPB_CHAR_SET_DEV) == 0)
+  if (strcmp(name, PPB_CHAR_SET_DEV_INTERFACE) == 0)
     return CharSet::GetInterface();
 
   // Only support the testing interface when the command line switch is
diff --git a/webkit/glue/plugins/pepper_video_decoder.cc b/webkit/glue/plugins/pepper_video_decoder.cc
index 3f86971..ed572b3 100644
--- a/webkit/glue/plugins/pepper_video_decoder.cc
+++ b/webkit/glue/plugins/pepper_video_decoder.cc
@@ -5,10 +5,10 @@
 #include "webkit/glue/plugins/pepper_video_decoder.h"
 
 #include "base/logging.h"
+#include "third_party/ppapi/c/dev/pp_video_dev.h"
+#include "third_party/ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "third_party/ppapi/c/pp_completion_callback.h"
 #include "third_party/ppapi/c/pp_errors.h"
-#include "third_party/ppapi/c/pp_video.h"
-#include "third_party/ppapi/c/ppb_video_decoder.h"
 #include "webkit/glue/plugins/pepper_file_ref.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 #include "webkit/glue/plugins/pepper_resource_tracker.h"
@@ -18,8 +18,8 @@ namespace pepper {
 namespace {
 
 bool GetConfig(PP_Instance instance_id,
-               PP_VideoCodecId codec,
-               PP_VideoConfig* configs,
+               PP_VideoCodecId_Dev codec,
+               PP_VideoConfig_Dev* configs,
                int32_t config_size,
                int32_t *num_config) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
@@ -39,7 +39,7 @@ bool GetConfig(PP_Instance instance_id,
 }
 
 PP_Resource Create(PP_Instance instance_id,
-                   const PP_VideoDecoderConfig* decoder_config) {
+                   const PP_VideoDecoderConfig_Dev* decoder_config) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return 0;
@@ -53,7 +53,7 @@ PP_Resource Create(PP_Instance instance_id,
 }
 
 bool Decode(PP_Resource decoder_id,
-            PP_VideoCompressedDataBuffer* input_buffer) {
+            PP_VideoCompressedDataBuffer_Dev* input_buffer) {
   scoped_refptr<VideoDecoder> decoder(
       Resource::GetAs<VideoDecoder>(decoder_id));
   if (!decoder)
@@ -73,7 +73,7 @@ int32_t Flush(PP_Resource decoder_id, PP_CompletionCallback callback) {
 }
 
 bool ReturnUncompressedDataBuffer(PP_Resource decoder_id,
-                                  PP_VideoUncompressedDataBuffer* buffer) {
+                                  PP_VideoUncompressedDataBuffer_Dev* buffer) {
   scoped_refptr<VideoDecoder> decoder(
       Resource::GetAs<VideoDecoder>(decoder_id));
   if (!decoder)
@@ -82,7 +82,7 @@ bool ReturnUncompressedDataBuffer(PP_Resource decoder_id,
   return decoder->ReturnUncompressedDataBuffer(*buffer);
 }
 
-const PPB_VideoDecoder ppb_videodecoder = {
+const PPB_VideoDecoder_Dev ppb_videodecoder = {
   &GetConfig,
   &Create,
   &Decode,
@@ -101,11 +101,11 @@ VideoDecoder::~VideoDecoder() {
 }
 
 // static
-const PPB_VideoDecoder* VideoDecoder::GetInterface() {
+const PPB_VideoDecoder_Dev* VideoDecoder::GetInterface() {
   return &ppb_videodecoder;
 }
 
-bool VideoDecoder::Init(const PP_VideoDecoderConfig& decoder_config) {
+bool VideoDecoder::Init(const PP_VideoDecoderConfig_Dev& decoder_config) {
   if (!instance())
     return false;
 
@@ -115,7 +115,7 @@ bool VideoDecoder::Init(const PP_VideoDecoderConfig& decoder_config) {
   return platform_video_decoder_.get()? true : false;
 }
 
-bool VideoDecoder::Decode(PP_VideoCompressedDataBuffer& input_buffer) {
+bool VideoDecoder::Decode(PP_VideoCompressedDataBuffer_Dev& input_buffer) {
   if (!platform_video_decoder_.get())
     return false;
 
@@ -130,7 +130,7 @@ int32_t VideoDecoder::Flush(PP_CompletionCallback& callback) {
 }
 
 bool VideoDecoder::ReturnUncompressedDataBuffer(
-    PP_VideoUncompressedDataBuffer& buffer) {
+    PP_VideoUncompressedDataBuffer_Dev& buffer) {
   if (!platform_video_decoder_.get())
     return false;
 
diff --git a/webkit/glue/plugins/pepper_video_decoder.h b/webkit/glue/plugins/pepper_video_decoder.h
index 67ac6c0..c828709 100644
--- a/webkit/glue/plugins/pepper_video_decoder.h
+++ b/webkit/glue/plugins/pepper_video_decoder.h
@@ -6,11 +6,14 @@
 #define WEBKIT_GLUE_PLUGINS_PEPPER_VIDEO_DECODER_H_
 
 #include "base/scoped_ptr.h"
-#include "third_party/ppapi/c/pp_video.h"
-#include "third_party/ppapi/c/ppb_video_decoder.h"
 #include "webkit/glue/plugins/pepper_plugin_delegate.h"
 #include "webkit/glue/plugins/pepper_resource.h"
 
+struct PP_VideoDecoderConfig_Dev;
+struct PP_VideoCompressedDataBuffer_Dev;
+struct PP_VideoUncompressedDataBuffer_Dev;
+struct PPB_VideoDecoder_Dev;
+
 namespace pepper {
 
 class PluginInstance;
@@ -22,7 +25,7 @@ class VideoDecoder : public Resource {
 
   // Returns a pointer to the interface implementing PPB_VideoDecoder that is
   // exposed to the plugin.
-  static const PPB_VideoDecoder* GetInterface();
+  static const PPB_VideoDecoder_Dev* GetInterface();
 
   // Resource overrides.
   VideoDecoder* AsVideoDecoder() { return this; }
@@ -30,10 +33,10 @@ class VideoDecoder : public Resource {
   PluginInstance* instance() { return instance_.get(); }
 
   // PPB_VideoDecoder implementation.
-  bool Init(const PP_VideoDecoderConfig& decoder_config);
-  bool Decode(PP_VideoCompressedDataBuffer& input_buffer);
+  bool Init(const PP_VideoDecoderConfig_Dev& decoder_config);
+  bool Decode(PP_VideoCompressedDataBuffer_Dev& input_buffer);
   int32_t Flush(PP_CompletionCallback& callback);
-  bool ReturnUncompressedDataBuffer(PP_VideoUncompressedDataBuffer& buffer);
+  bool ReturnUncompressedDataBuffer(PP_VideoUncompressedDataBuffer_Dev& buffer);
 
  private:
   // This is NULL before initialization, and if this VideoDecoder is