Update PPAPI IDL generator to define versioned structs, and unversioned typedef.

For interface Foo with versions A and B, structs will be defined for Foo_A and Foo_B, and a typedef generated from Foo_B to Foo.  Versioning of IDL structs remains unchanged.

(Follow-up to discussion on CL 8931019)

*** This change breaks compatibility with C code that makes use of unversioned-named interface structs. :( ***

We need to define a versioned-named struct for each interface's current version.  We could:

1.  Carry on defining the current struct unversioned and typedef a versioned name for it.
    The versioned type for the interface would be a typedef for the latest version and a struct for later versions, causing calling C code that uses it to break when a new version is added.

2.  Define structs for all versions, and a separate unversioned struct.
    This would lose type equivalence between the versioned and unversioned copies of the latest interface specification, and lead to needless duplication, especially for one-version interfaces.

3.  Do this CL.  We break some C code once, by change the unversioned type from struct to typedef, but we avoid these headaches in future.  C++ code shouldn't be affected.

*** Contents of this CL, including notes on to-dos:

This change requires updating thunk-getters to be defined using versioned names, so that the interface structs can be forward declared; the thunk-getters now have versioned names and return values.

Changing the thunk-getter naming requires updating unit-tests to call the versioned names.  It also requires some interface headers not generated from IDL to be manually updated to the new scheme (PPB_CharSet_Dev, PPB_Crypto_Dev, PPB_DirectoryReader_Dev, PPB_LayerCompositor_Dev, PPB_Graphics3D, PPB_Flash_Menu, PPB_Instance_Private, PPP_Pdf, PPB_Flash_NetConnector, PPB_GLESChromiumTextureMapping_Dev and PPB_Graphics3D_Trusted).

The proxy GetInfo() calls are updated to use versioned interface macros and thunks.  Similarly, most PPBs added in interface_list.cc are now added using versioned interface macros and thunk getters.  Ditto PluginModule, and some of PluginInstance.  Some implementations (e.g. PPB_CharSet_Dev) needed updating to use versioned thunk getters to fetch interfaces to use.

The VideoDecoder interface size checks are for 32-bit are updated not to expect structs.

It was necessary to replace forward declarations of interface structs with includes, and remove "struct" prefixes where unversioned names were used.  In most cases the affected code should really be updated to cope with versions.

PPP_Pdf has become PPP_Pdf_1.  Other versionless structs that should be updated for consistenct include PPB_UMA_Private, PPB_GPU_Blacklist_Private, PPB_Proxy_Private, PPP_PDF, PPB_OpenGLES2, PPB_Flash_File_FileRef and PPB_Flash_File_ModuleLocal.  Also PPP_Class_Deprecated, PPP_CursorControl_Dev, PPP_Find_Dev, PPP_NetworkState_Dev, PPP_Scrollbar_Dev, PPP_Selection_Dev, PPP_VideoCapture_Dev, PPP_Graphics3D and PPP_Instance_Private.

The Graphics2D and GLES2 examples now use unversioned interface type names without "struct" prefix.  It's not clear whether examples should use versioned names, to show best practice, or unversioned.

The typedef hack in PPP_Instance IDL is gone.  Yay.

BUG=107398,108379
TEST=All Pepper and NaCl tests should continue to pass on Chromium bots.  NaCl SDK examples build correctly.

Review URL: http://codereview.chromium.org/8989006

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

54 files changed, 216 insertions, 208 deletions

diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h
index c6770f8..6513e0d 100644
--- a/ppapi/thunk/interfaces_ppb_private.h
+++ b/ppapi/thunk/interfaces_ppb_private.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -11,16 +11,20 @@ PROXIED_API(PPB_Broker)
 PROXIED_API(PPB_TCPSocket_Private)
 PROXIED_API(PPB_UDPSocket_Private)
 
-PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2, PPB_BrokerTrusted)
-PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1, PPB_FileRefPrivate)
+PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2,
+              PPB_BrokerTrusted_0_2)
+PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1,
+              PPB_FileRefPrivate_0_1)
 // This uses the FileIO API which is declared in the public stable file.
-PROXIED_IFACE(PPB_FileIO, PPB_FILEIOTRUSTED_INTERFACE_0_4, PPB_FileIOTrusted)
-PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE, PPB_FlashFullscreen)
-PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE,
-              PPB_NetAddress_Private)
-PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE,
-              PPB_TCPSocket_Private)
-PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE,
-              PPB_UDPSocket_Private)
+PROXIED_IFACE(PPB_FileIO, PPB_FILEIOTRUSTED_INTERFACE_0_4,
+              PPB_FileIOTrusted_0_4)
+PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_0_1,
+              PPB_FlashFullscreen_0_1)
+PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE_0_1,
+              PPB_NetAddress_Private_0_1)
+PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_3,
+              PPB_TCPSocket_Private_0_3)
+PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2,
+              PPB_UDPSocket_Private_0_2)
 
 #include "ppapi/thunk/interfaces_postamble.h"
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index 2aa7ea4..7161449 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -25,42 +25,43 @@ UNPROXIED_API(PPB_WebSocket)
 UNPROXIED_API(PPB_Widget)
 
 PROXIED_IFACE(PPB_AudioInput, PPB_AUDIO_INPUT_DEV_INTERFACE_0_1,
-              PPB_AudioInput_Dev)
+              PPB_AudioInput_Dev_0_1)
 PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1,
-              PPB_IMEInputEvent_Dev)
-PROXIED_IFACE(PPB_Buffer, PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev)
-PROXIED_IFACE(PPB_Graphics3D, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE,
-              PPB_GLESChromiumTextureMapping_Dev)
-PROXIED_IFACE(NoAPIName, PPB_CRYPTO_DEV_INTERFACE, PPB_Crypto_Dev)
+              PPB_IMEInputEvent_Dev_0_1)
+PROXIED_IFACE(PPB_Buffer, PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev_0_4)
+PROXIED_IFACE(PPB_Graphics3D,
+              PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1,
+              PPB_GLESChromiumTextureMapping_Dev_0_1)
+PROXIED_IFACE(NoAPIName, PPB_CRYPTO_DEV_INTERFACE_0_1, PPB_Crypto_Dev_0_1)
 PROXIED_IFACE(PPB_CursorControl, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4,
-              PPB_CursorControl_Dev)
+              PPB_CursorControl_Dev_0_4)
 UNPROXIED_IFACE(PPB_DirectoryReader, PPB_DIRECTORYREADER_DEV_INTERFACE_0_5,
-                PPB_DirectoryReader_Dev)
-UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev)
+                PPB_DirectoryReader_Dev_0_5)
+UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev_0_3)
 PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_DEV_INTERFACE_0_5,
-              PPB_FileChooser_Dev)
-PROXIED_IFACE(PPB_Font, PPB_FONT_DEV_INTERFACE_0_6, PPB_Font_Dev)
-PROXIED_IFACE(PPB_Instance, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev)
-PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_DEV_INTERFACE, PPB_Console_Dev)
-PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev)
-UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev)
+              PPB_FileChooser_Dev_0_5)
+PROXIED_IFACE(PPB_Font, PPB_FONT_DEV_INTERFACE_0_6, PPB_Font_Dev_0_6)
+PROXIED_IFACE(PPB_Instance, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev_0_4)
+PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_DEV_INTERFACE_0_1, PPB_Console_Dev_0_1)
+PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev_0_6)
+UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev_0_2)
 UNPROXIED_IFACE(PPB_LayerCompositor, PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2,
-                PPB_LayerCompositor_Dev)
-PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE, PPB_Memory_Dev)
+                PPB_LayerCompositor_Dev_0_2)
+PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1)
 UNPROXIED_IFACE(PPB_Scrollbar, PPB_SCROLLBAR_DEV_INTERFACE_0_5,
-                PPB_Scrollbar_Dev)
+                PPB_Scrollbar_Dev_0_5)
 PROXIED_IFACE(PPB_TextInput, PPB_TEXTINPUT_DEV_INTERFACE_0_1,
-              PPB_TextInput_Dev)
+              PPB_TextInput_Dev_0_1)
 UNPROXIED_IFACE(PPB_Transport, PPB_TRANSPORT_DEV_INTERFACE_0_7,
-                PPB_Transport_Dev)
+                PPB_Transport_Dev_0_7)
 PROXIED_IFACE(PPB_VideoCapture, PPB_VIDEOCAPTURE_DEV_INTERFACE_0_1,
-              PPB_VideoCapture_Dev)
+              PPB_VideoCapture_Dev_0_1)
 PROXIED_IFACE(PPB_VideoDecoder, PPB_VIDEODECODER_DEV_INTERFACE_0_16,
-              PPB_VideoDecoder_Dev)
-UNPROXIED_IFACE(PPB_VideoLayer, PPB_VIDEOLAYER_DEV_INTERFACE,
-                PPB_VideoLayer_Dev)
+              PPB_VideoDecoder_Dev_0_16)
+UNPROXIED_IFACE(PPB_VideoLayer, PPB_VIDEOLAYER_DEV_INTERFACE_0_1,
+                PPB_VideoLayer_Dev_0_1)
 UNPROXIED_IFACE(PPB_WebSocket, PPB_WEBSOCKET_DEV_INTERFACE_0_1,
-                PPB_WebSocket_Dev)
-UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev)
+                PPB_WebSocket_Dev_0_1)
+UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev_0_3)
 
 #include "ppapi/thunk/interfaces_postamble.h"
diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h
index 56498d8..6556cf4 100644
--- a/ppapi/thunk/interfaces_ppb_public_stable.h
+++ b/ppapi/thunk/interfaces_ppb_public_stable.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -46,34 +46,35 @@ PROXIED_API(PPB_URLResponseInfo)
 //
 // The interface_struct is the typename of the struct corresponding to the
 // interface string.
-PROXIED_IFACE(PPB_Audio, PPB_AUDIO_INTERFACE_1_0, PPB_Audio)
+PROXIED_IFACE(PPB_Audio, PPB_AUDIO_INTERFACE_1_0, PPB_Audio_1_0)
 // This has no corresponding _Proxy object since it does no IPC.
-PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_0, PPB_AudioConfig)
+PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_0, PPB_AudioConfig_1_0)
 // Note: Core is special and is registered manually.
-PROXIED_IFACE(PPB_FileIO, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO)
-PROXIED_IFACE(PPB_FileRef, PPB_FILEREF_INTERFACE_1_0, PPB_FileRef)
-PROXIED_IFACE(PPB_FileSystem, PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem)
-PROXIED_IFACE(PPB_Graphics2D, PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D)
-PROXIED_IFACE(PPB_Graphics3D, PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D)
-PROXIED_IFACE(PPB_ImageData, PPB_IMAGEDATA_INTERFACE_1_0, PPB_ImageData)
-PROXIED_IFACE(PPB_Instance, PPB_INSTANCE_INTERFACE_1_0, PPB_Instance)
-PROXIED_IFACE(NoAPIName, PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent)
+PROXIED_IFACE(PPB_FileIO, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO_1_0)
+PROXIED_IFACE(PPB_FileRef, PPB_FILEREF_INTERFACE_1_0, PPB_FileRef_1_0)
+PROXIED_IFACE(PPB_FileSystem, PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem_1_0)
+PROXIED_IFACE(PPB_Graphics2D, PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D_1_0)
+PROXIED_IFACE(PPB_Graphics3D, PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D_1_0)
+PROXIED_IFACE(PPB_ImageData, PPB_IMAGEDATA_INTERFACE_1_0, PPB_ImageData_1_0)
+PROXIED_IFACE(PPB_Instance, PPB_INSTANCE_INTERFACE_1_0, PPB_Instance_1_0)
+PROXIED_IFACE(NoAPIName, PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent_1_0)
 PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_0,
-              PPB_KeyboardInputEvent)
+              PPB_KeyboardInputEvent_1_0)
 PROXIED_IFACE(NoAPIName, PPB_MOUSE_INPUT_EVENT_INTERFACE_1_0,
               PPB_MouseInputEvent_1_0)
 PROXIED_IFACE(NoAPIName, PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1,
-              PPB_MouseInputEvent)
+              PPB_MouseInputEvent_1_1)
 PROXIED_IFACE(NoAPIName, PPB_WHEEL_INPUT_EVENT_INTERFACE_1_0,
-              PPB_WheelInputEvent)
-PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen)
-PROXIED_IFACE(PPB_Instance, PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging)
-PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock)
-PROXIED_IFACE(PPB_URLLoader, PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader)
-PROXIED_IFACE(NoAPIName, PPB_URLREQUESTINFO_INTERFACE_1_0, PPB_URLRequestInfo)
+              PPB_WheelInputEvent_1_0)
+PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen_1_0)
+PROXIED_IFACE(PPB_Instance, PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging_1_0)
+PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock_1_0)
+PROXIED_IFACE(PPB_URLLoader, PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader_1_0)
+PROXIED_IFACE(NoAPIName, PPB_URLREQUESTINFO_INTERFACE_1_0,
+              PPB_URLRequestInfo_1_0)
 PROXIED_IFACE(PPB_URLResponseInfo, PPB_URLRESPONSEINFO_INTERFACE_1_0,
-              PPB_URLResponseInfo)
+              PPB_URLResponseInfo_1_0)
 // Note: PPB_Var is special and registered manually.
-PROXIED_IFACE(NoAPIName, PPB_VIEW_INTERFACE_1_0, PPB_View)
+PROXIED_IFACE(NoAPIName, PPB_VIEW_INTERFACE_1_0, PPB_View_1_0)
 
 #include "ppapi/thunk/interfaces_postamble.h"
diff --git a/ppapi/thunk/ppb_audio_config_thunk.cc b/ppapi/thunk/ppb_audio_config_thunk.cc
index ca3d589..2cc82a3 100644
--- a/ppapi/thunk/ppb_audio_config_thunk.cc
+++ b/ppapi/thunk/ppb_audio_config_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -62,7 +62,7 @@ const PPB_AudioConfig g_ppb_audio_config_thunk = {
 
 }  // namespace
 
-const PPB_AudioConfig* GetPPB_AudioConfig_Thunk() {
+const PPB_AudioConfig_1_0* GetPPB_AudioConfig_1_0_Thunk() {
   return &g_ppb_audio_config_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_audio_input_thunk.cc b/ppapi/thunk/ppb_audio_input_thunk.cc
index 7b6f31c..dbc697f 100644
--- a/ppapi/thunk/ppb_audio_input_thunk.cc
+++ b/ppapi/thunk/ppb_audio_input_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -66,7 +66,7 @@ const PPB_AudioInput_Dev g_ppb_audioinput_thunk = {
 
 }  // namespace
 
-const PPB_AudioInput_Dev* GetPPB_AudioInput_Dev_Thunk() {
+const PPB_AudioInput_Dev_0_1* GetPPB_AudioInput_Dev_0_1_Thunk() {
   return &g_ppb_audioinput_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_audio_input_trusted_thunk.cc b/ppapi/thunk/ppb_audio_input_trusted_thunk.cc
index 1de878c..3a44a30 100644
--- a/ppapi/thunk/ppb_audio_input_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_audio_input_trusted_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -59,7 +59,7 @@ const PPB_AudioInputTrusted_Dev g_ppb_audioinput_trusted_thunk = {
 
 }  // namespace
 
-const PPB_AudioInputTrusted_Dev* GetPPB_AudioInputTrusted_Thunk() {
+const PPB_AudioInputTrusted_Dev_0_1* GetPPB_AudioInputTrusted_0_1_Thunk() {
   return &g_ppb_audioinput_trusted_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_audio_thunk.cc b/ppapi/thunk/ppb_audio_thunk.cc
index 18b70b6..33ddacd 100644
--- a/ppapi/thunk/ppb_audio_thunk.cc
+++ b/ppapi/thunk/ppb_audio_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -61,7 +61,7 @@ const PPB_Audio g_ppb_audio_thunk = {
 
 }  // namespace
 
-const PPB_Audio* GetPPB_Audio_Thunk() {
+const PPB_Audio_1_0* GetPPB_Audio_1_0_Thunk() {
   return &g_ppb_audio_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_audio_trusted_thunk.cc b/ppapi/thunk/ppb_audio_trusted_thunk.cc
index 97f8978..da49425 100644
--- a/ppapi/thunk/ppb_audio_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_audio_trusted_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -59,7 +59,7 @@ const PPB_AudioTrusted g_ppb_audio_trusted_thunk = {
 
 }  // namespace
 
-const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk() {
+const PPB_AudioTrusted_0_6* GetPPB_AudioTrusted_0_6_Thunk() {
   return &g_ppb_audio_trusted_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_broker_thunk.cc b/ppapi/thunk/ppb_broker_thunk.cc
index c6c1cd1..6b3f936 100644
--- a/ppapi/thunk/ppb_broker_thunk.cc
+++ b/ppapi/thunk/ppb_broker_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -52,7 +52,7 @@ const PPB_BrokerTrusted g_ppb_broker_thunk = {
 
 }  // namespace
 
-const PPB_BrokerTrusted* GetPPB_BrokerTrusted_Thunk() {
+const PPB_BrokerTrusted_0_2* GetPPB_BrokerTrusted_0_2_Thunk() {
   return &g_ppb_broker_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_buffer_thunk.cc b/ppapi/thunk/ppb_buffer_thunk.cc
index 1772048..177a342 100644
--- a/ppapi/thunk/ppb_buffer_thunk.cc
+++ b/ppapi/thunk/ppb_buffer_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -57,7 +57,7 @@ const PPB_Buffer_Dev g_ppb_buffer_thunk = {
 
 }  // namespace
 
-const PPB_Buffer_Dev* GetPPB_Buffer_Dev_Thunk() {
+const PPB_Buffer_Dev_0_4* GetPPB_Buffer_Dev_0_4_Thunk() {
   return &g_ppb_buffer_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_buffer_trusted_thunk.cc b/ppapi/thunk/ppb_buffer_trusted_thunk.cc
index f20d6d5..19506db 100644
--- a/ppapi/thunk/ppb_buffer_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_buffer_trusted_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -26,7 +26,7 @@ const PPB_BufferTrusted g_ppb_buffer_trusted_thunk = {
 
 }  // namespace
 
-const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk() {
+const PPB_BufferTrusted_0_1* GetPPB_BufferTrusted_0_1_Thunk() {
   return &g_ppb_buffer_trusted_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_char_set_thunk.cc b/ppapi/thunk/ppb_char_set_thunk.cc
index 27419b4..c5cb1de 100644
--- a/ppapi/thunk/ppb_char_set_thunk.cc
+++ b/ppapi/thunk/ppb_char_set_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -68,7 +68,7 @@ const PPB_CharSet_Dev g_ppb_char_set_thunk = {
 
 }  // namespace
 
-const PPB_CharSet_Dev* GetPPB_CharSet_Dev_Thunk() {
+const PPB_CharSet_Dev_0_4* GetPPB_CharSet_Dev_0_4_Thunk() {
   return &g_ppb_char_set_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_console_thunk.cc b/ppapi/thunk/ppb_console_thunk.cc
index 509c128..1a14164 100644
--- a/ppapi/thunk/ppb_console_thunk.cc
+++ b/ppapi/thunk/ppb_console_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -34,7 +34,7 @@ const PPB_Console_Dev g_ppb_console_thunk = {
 
 }  // namespace
 
-const PPB_Console_Dev* GetPPB_Console_Dev_Thunk() {
+const PPB_Console_Dev_0_1* GetPPB_Console_Dev_0_1_Thunk() {
   return &g_ppb_console_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_cursor_control_thunk.cc b/ppapi/thunk/ppb_cursor_control_thunk.cc
index b1f5409..b1b2077 100644
--- a/ppapi/thunk/ppb_cursor_control_thunk.cc
+++ b/ppapi/thunk/ppb_cursor_control_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -59,7 +59,7 @@ const PPB_CursorControl_Dev g_ppb_cursor_control_thunk = {
 
 }  // namespace
 
-const PPB_CursorControl_Dev* GetPPB_CursorControl_Dev_Thunk() {
+const PPB_CursorControl_Dev_0_4* GetPPB_CursorControl_Dev_0_4_Thunk() {
   return &g_ppb_cursor_control_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_directory_reader_thunk.cc b/ppapi/thunk/ppb_directory_reader_thunk.cc
index f8e95537..f03b165 100644
--- a/ppapi/thunk/ppb_directory_reader_thunk.cc
+++ b/ppapi/thunk/ppb_directory_reader_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -46,7 +46,7 @@ const PPB_DirectoryReader_Dev g_ppb_directory_reader_thunk = {
 
 }  // namespace
 
-const PPB_DirectoryReader_Dev* GetPPB_DirectoryReader_Dev_Thunk() {
+const PPB_DirectoryReader_Dev_0_5* GetPPB_DirectoryReader_Dev_0_5_Thunk() {
   return &g_ppb_directory_reader_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_file_chooser_thunk.cc b/ppapi/thunk/ppb_file_chooser_thunk.cc
index e5cbc5d..1e783f9 100644
--- a/ppapi/thunk/ppb_file_chooser_thunk.cc
+++ b/ppapi/thunk/ppb_file_chooser_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -78,11 +78,11 @@ const PPB_FileChooserTrusted g_ppb_file_chooser_trusted_thunk = {
 
 }  // namespace
 
-const PPB_FileChooser_Dev* GetPPB_FileChooser_Dev_Thunk() {
+const PPB_FileChooser_Dev_0_5* GetPPB_FileChooser_Dev_0_5_Thunk() {
   return &g_ppb_file_chooser_thunk;
 }
 
-const PPB_FileChooserTrusted* GetPPB_FileChooser_Trusted_Thunk() {
+const PPB_FileChooserTrusted_0_5* GetPPB_FileChooser_Trusted_0_5_Thunk() {
   return &g_ppb_file_chooser_trusted_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_file_io_thunk.cc b/ppapi/thunk/ppb_file_io_thunk.cc
index 4882bdf..52d4ea6 100644
--- a/ppapi/thunk/ppb_file_io_thunk.cc
+++ b/ppapi/thunk/ppb_file_io_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -126,7 +126,7 @@ const PPB_FileIO g_ppb_file_io_thunk = {
 
 }  // namespace
 
-const PPB_FileIO* GetPPB_FileIO_Thunk() {
+const PPB_FileIO_1_0* GetPPB_FileIO_1_0_Thunk() {
   return &g_ppb_file_io_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_file_io_trusted_thunk.cc b/ppapi/thunk/ppb_file_io_trusted_thunk.cc
index e1789bd..709af437 100644
--- a/ppapi/thunk/ppb_file_io_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_file_io_trusted_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -52,7 +52,7 @@ const PPB_FileIOTrusted g_ppb_file_io_trusted_thunk = {
 
 }  // namespace
 
-const PPB_FileIOTrusted* GetPPB_FileIOTrusted_Thunk() {
+const PPB_FileIOTrusted_0_4* GetPPB_FileIOTrusted_0_4_Thunk() {
   return &g_ppb_file_io_trusted_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_file_ref_thunk.cc b/ppapi/thunk/ppb_file_ref_thunk.cc
index 5041c55..7fdb8ac 100644
--- a/ppapi/thunk/ppb_file_ref_thunk.cc
+++ b/ppapi/thunk/ppb_file_ref_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -125,11 +125,11 @@ const PPB_FileRefPrivate g_ppb_file_ref_private_thunk = {
 
 }  // namespace
 
-const PPB_FileRef* GetPPB_FileRef_Thunk() {
+const PPB_FileRef_1_0* GetPPB_FileRef_1_0_Thunk() {
   return &g_ppb_file_ref_thunk;
 }
 
-const PPB_FileRefPrivate* GetPPB_FileRefPrivate_Thunk() {
+const PPB_FileRefPrivate_0_1* GetPPB_FileRefPrivate_0_1_Thunk() {
   return &g_ppb_file_ref_private_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_file_system_thunk.cc b/ppapi/thunk/ppb_file_system_thunk.cc
index ad2c8db..1e82c91 100644
--- a/ppapi/thunk/ppb_file_system_thunk.cc
+++ b/ppapi/thunk/ppb_file_system_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -54,7 +54,7 @@ const PPB_FileSystem g_ppb_file_system_thunk = {
 
 }  // namespace
 
-const PPB_FileSystem* GetPPB_FileSystem_Thunk() {
+const PPB_FileSystem_1_0* GetPPB_FileSystem_1_0_Thunk() {
   return &g_ppb_file_system_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_find_thunk.cc b/ppapi/thunk/ppb_find_thunk.cc
index 82faa3c..53911e4 100644
--- a/ppapi/thunk/ppb_find_thunk.cc
+++ b/ppapi/thunk/ppb_find_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -32,7 +32,7 @@ const PPB_Find_Dev g_ppb_find_thunk = {
 
 }  // namespace
 
-const PPB_Find_Dev* GetPPB_Find_Dev_Thunk() {
+const PPB_Find_Dev_0_3* GetPPB_Find_Dev_0_3_Thunk() {
   return &g_ppb_find_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_flash_clipboard_thunk.cc b/ppapi/thunk/ppb_flash_clipboard_thunk.cc
index 010aa2f..ffecb34 100644
--- a/ppapi/thunk/ppb_flash_clipboard_thunk.cc
+++ b/ppapi/thunk/ppb_flash_clipboard_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -49,7 +49,7 @@ const PPB_Flash_Clipboard g_ppb_flash_clipboard_thunk = {
 
 }  // namespace
 
-const PPB_Flash_Clipboard* GetPPB_Flash_Clipboard_Thunk() {
+const PPB_Flash_Clipboard_3_0* GetPPB_Flash_Clipboard_3_0_Thunk() {
   return &g_ppb_flash_clipboard_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_flash_fullscreen_thunk.cc b/ppapi/thunk/ppb_flash_fullscreen_thunk.cc
index 594089e..ecaea96 100644
--- a/ppapi/thunk/ppb_flash_fullscreen_thunk.cc
+++ b/ppapi/thunk/ppb_flash_fullscreen_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -43,7 +43,7 @@ const PPB_FlashFullscreen g_ppb_flash_fullscreen_thunk = {
 
 }  // namespace
 
-const PPB_FlashFullscreen* GetPPB_FlashFullscreen_Thunk() {
+const PPB_FlashFullscreen_0_1* GetPPB_FlashFullscreen_0_1_Thunk() {
   return &g_ppb_flash_fullscreen_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_flash_menu_thunk.cc b/ppapi/thunk/ppb_flash_menu_thunk.cc
index 3641e1e..9426aa9 100644
--- a/ppapi/thunk/ppb_flash_menu_thunk.cc
+++ b/ppapi/thunk/ppb_flash_menu_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -47,7 +47,7 @@ const PPB_Flash_Menu g_ppb_flash_menu_thunk = {
 
 }  // namespace
 
-const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk() {
+const PPB_Flash_Menu_0_2* GetPPB_Flash_Menu_0_2_Thunk() {
   return &g_ppb_flash_menu_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_font_thunk.cc b/ppapi/thunk/ppb_font_thunk.cc
index 841170a..23e21cd 100644
--- a/ppapi/thunk/ppb_font_thunk.cc
+++ b/ppapi/thunk/ppb_font_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -93,7 +93,7 @@ const PPB_Font_Dev g_ppb_font_thunk = {
 
 }  // namespace
 
-const PPB_Font_Dev* GetPPB_Font_Dev_Thunk() {
+const PPB_Font_Dev_0_6* GetPPB_Font_Dev_0_6_Thunk() {
   return &g_ppb_font_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_fullscreen_thunk.cc b/ppapi/thunk/ppb_fullscreen_thunk.cc
index 5f2a0e0..b241938 100644
--- a/ppapi/thunk/ppb_fullscreen_thunk.cc
+++ b/ppapi/thunk/ppb_fullscreen_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -46,7 +46,7 @@ const PPB_Fullscreen g_ppb_fullscreen_thunk = {
 
 }  // namespace
 
-const PPB_Fullscreen* GetPPB_Fullscreen_Thunk() {
+const PPB_Fullscreen_1_0* GetPPB_Fullscreen_1_0_Thunk() {
   return &g_ppb_fullscreen_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
index 0963631f7..a9ecd05 100644
--- a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
+++ b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -46,8 +46,8 @@ g_ppb_gles_chromium_texture_mapping_thunk = {
 
 }  // namespace
 
-const PPB_GLESChromiumTextureMapping_Dev*
-GetPPB_GLESChromiumTextureMapping_Dev_Thunk() {
+const PPB_GLESChromiumTextureMapping_Dev_0_1*
+GetPPB_GLESChromiumTextureMapping_Dev_0_1_Thunk() {
   return &g_ppb_gles_chromium_texture_mapping_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_graphics_2d_thunk.cc b/ppapi/thunk/ppb_graphics_2d_thunk.cc
index df6d569..e42d002 100644
--- a/ppapi/thunk/ppb_graphics_2d_thunk.cc
+++ b/ppapi/thunk/ppb_graphics_2d_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -90,7 +90,7 @@ const PPB_Graphics2D g_ppb_graphics_2d_thunk = {
 
 }  // namespace
 
-const PPB_Graphics2D* GetPPB_Graphics2D_Thunk() {
+const PPB_Graphics2D_1_0* GetPPB_Graphics2D_1_0_Thunk() {
   return &g_ppb_graphics_2d_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_graphics_3d_thunk.cc b/ppapi/thunk/ppb_graphics_3d_thunk.cc
index f0e516c..490561b 100644
--- a/ppapi/thunk/ppb_graphics_3d_thunk.cc
+++ b/ppapi/thunk/ppb_graphics_3d_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -89,7 +89,7 @@ const PPB_Graphics3D g_ppb_graphics_3d_thunk = {
 
 }  // namespace
 
-const PPB_Graphics3D* GetPPB_Graphics3D_Thunk() {
+const PPB_Graphics3D_1_0* GetPPB_Graphics3D_1_0_Thunk() {
   return &g_ppb_graphics_3d_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc b/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc
index bea32ab..8933d12 100644
--- a/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -113,10 +113,9 @@ const PPB_Graphics3DTrusted g_ppb_graphics_3d_trusted_thunk = {
 
 }  // namespace
 
-const PPB_Graphics3DTrusted* GetPPB_Graphics3DTrusted_Thunk() {
+const PPB_Graphics3DTrusted_1_0* GetPPB_Graphics3DTrusted_1_0_Thunk() {
   return &g_ppb_graphics_3d_trusted_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi
-
diff --git a/ppapi/thunk/ppb_image_data_thunk.cc b/ppapi/thunk/ppb_image_data_thunk.cc
index 00d9184..71c94f7 100644
--- a/ppapi/thunk/ppb_image_data_thunk.cc
+++ b/ppapi/thunk/ppb_image_data_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -76,7 +76,7 @@ const PPB_ImageData g_ppb_image_data_thunk = {
 
 }  // namespace
 
-const PPB_ImageData* GetPPB_ImageData_Thunk() {
+const PPB_ImageData_1_0* GetPPB_ImageData_1_0_Thunk() {
   return &g_ppb_image_data_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_image_data_trusted_thunk.cc b/ppapi/thunk/ppb_image_data_trusted_thunk.cc
index db53aa2..8cf6789 100644
--- a/ppapi/thunk/ppb_image_data_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_image_data_trusted_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -28,7 +28,7 @@ const PPB_ImageDataTrusted g_ppb_image_data_trusted_thunk = {
 
 }  // namespace
 
-const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk() {
+const PPB_ImageDataTrusted_0_4* GetPPB_ImageDataTrusted_0_4_Thunk() {
   return &g_ppb_image_data_trusted_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_input_event_thunk.cc b/ppapi/thunk/ppb_input_event_thunk.cc
index 7c8820a..5023461 100644
--- a/ppapi/thunk/ppb_input_event_thunk.cc
+++ b/ppapi/thunk/ppb_input_event_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -331,7 +331,7 @@ const PPB_IMEInputEvent_Dev g_ppb_ime_input_event_thunk = {
 
 }  // namespace
 
-const PPB_InputEvent* GetPPB_InputEvent_Thunk() {
+const PPB_InputEvent_1_0* GetPPB_InputEvent_1_0_Thunk() {
   return &g_ppb_input_event_thunk;
 }
 
@@ -339,19 +339,19 @@ const PPB_MouseInputEvent_1_0* GetPPB_MouseInputEvent_1_0_Thunk() {
   return &g_ppb_mouse_input_event_1_0_thunk;
 }
 
-const PPB_MouseInputEvent* GetPPB_MouseInputEvent_Thunk() {
+const PPB_MouseInputEvent_1_1* GetPPB_MouseInputEvent_1_1_Thunk() {
   return &g_ppb_mouse_input_event_1_1_thunk;
 }
 
-const PPB_KeyboardInputEvent* GetPPB_KeyboardInputEvent_Thunk() {
+const PPB_KeyboardInputEvent_1_0* GetPPB_KeyboardInputEvent_1_0_Thunk() {
   return &g_ppb_keyboard_input_event_thunk;
 }
 
-const PPB_WheelInputEvent* GetPPB_WheelInputEvent_Thunk() {
+const PPB_WheelInputEvent_1_0* GetPPB_WheelInputEvent_1_0_Thunk() {
   return &g_ppb_wheel_input_event_thunk;
 }
 
-const PPB_IMEInputEvent_Dev* GetPPB_IMEInputEvent_Dev_Thunk() {
+const PPB_IMEInputEvent_Dev_0_1* GetPPB_IMEInputEvent_Dev_0_1_Thunk() {
   return &g_ppb_ime_input_event_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_instance_thunk.cc b/ppapi/thunk/ppb_instance_thunk.cc
index 07951bc..d8117fa1a 100644
--- a/ppapi/thunk/ppb_instance_thunk.cc
+++ b/ppapi/thunk/ppb_instance_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -62,10 +62,10 @@ const PPB_Instance_Private g_ppb_instance_private_thunk = {
 
 }  // namespace
 
-const PPB_Instance* GetPPB_Instance_Thunk() {
+const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk() {
   return &g_ppb_instance_thunk;
 }
-const PPB_Instance_Private* GetPPB_Instance_Private_Thunk() {
+const PPB_Instance_Private_0_1* GetPPB_Instance_Private_0_1_Thunk() {
   return &g_ppb_instance_private_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_layer_compositor_thunk.cc b/ppapi/thunk/ppb_layer_compositor_thunk.cc
index 44a95eb..df03a43 100644
--- a/ppapi/thunk/ppb_layer_compositor_thunk.cc
+++ b/ppapi/thunk/ppb_layer_compositor_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -63,7 +63,7 @@ const PPB_LayerCompositor_Dev g_ppb_layer_compositor_thunk = {
 
 }  // namespace
 
-const PPB_LayerCompositor_Dev* GetPPB_LayerCompositor_Dev_Thunk() {
+const PPB_LayerCompositor_Dev_0_2* GetPPB_LayerCompositor_Dev_0_2_Thunk() {
   return &g_ppb_layer_compositor_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_messaging_thunk.cc b/ppapi/thunk/ppb_messaging_thunk.cc
index 8b534e0..6880d3e 100644
--- a/ppapi/thunk/ppb_messaging_thunk.cc
+++ b/ppapi/thunk/ppb_messaging_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -24,7 +24,7 @@ const PPB_Messaging g_ppb_messaging_thunk = {
 
 }  // namespace
 
-const PPB_Messaging* GetPPB_Messaging_Thunk() {
+const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() {
   return &g_ppb_messaging_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_mouse_lock_thunk.cc b/ppapi/thunk/ppb_mouse_lock_thunk.cc
index a26e789..167a537 100644
--- a/ppapi/thunk/ppb_mouse_lock_thunk.cc
+++ b/ppapi/thunk/ppb_mouse_lock_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -36,7 +36,7 @@ const PPB_MouseLock g_ppb_mouse_lock_thunk = {
 
 }  // namespace
 
-const PPB_MouseLock* GetPPB_MouseLock_Thunk() {
+const PPB_MouseLock_1_0* GetPPB_MouseLock_1_0_Thunk() {
   return &g_ppb_mouse_lock_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_scrollbar_thunk.cc b/ppapi/thunk/ppb_scrollbar_thunk.cc
index c0ab39ce..5eb040f 100644
--- a/ppapi/thunk/ppb_scrollbar_thunk.cc
+++ b/ppapi/thunk/ppb_scrollbar_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -87,7 +87,7 @@ const PPB_Scrollbar_Dev g_ppb_scrollbar_thunk = {
 
 }  // namespace
 
-const PPB_Scrollbar_Dev* GetPPB_Scrollbar_Dev_Thunk() {
+const PPB_Scrollbar_Dev_0_5* GetPPB_Scrollbar_Dev_0_5_Thunk() {
   return &g_ppb_scrollbar_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc
index 245654d..9085e9b 100644
--- a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc
+++ b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -120,10 +120,9 @@ const PPB_TCPSocket_Private g_ppb_tcp_socket_thunk = {
 
 }  // namespace
 
-const PPB_TCPSocket_Private* GetPPB_TCPSocket_Private_Thunk() {
+const PPB_TCPSocket_Private_0_3* GetPPB_TCPSocket_Private_0_3_Thunk() {
   return &g_ppb_tcp_socket_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi
-
diff --git a/ppapi/thunk/ppb_text_input_thunk.cc b/ppapi/thunk/ppb_text_input_thunk.cc
index c0aba99..dda6864 100644
--- a/ppapi/thunk/ppb_text_input_thunk.cc
+++ b/ppapi/thunk/ppb_text_input_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -39,7 +39,7 @@ const PPB_TextInput_Dev g_ppb_textinput_thunk = {
 
 }  // namespace
 
-const PPB_TextInput_Dev* GetPPB_TextInput_Dev_Thunk() {
+const PPB_TextInput_Dev_0_1* GetPPB_TextInput_Dev_0_1_Thunk() {
   return &g_ppb_textinput_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_transport_thunk.cc b/ppapi/thunk/ppb_transport_thunk.cc
index b0caae1..0e6e7d7 100644
--- a/ppapi/thunk/ppb_transport_thunk.cc
+++ b/ppapi/thunk/ppb_transport_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -109,7 +109,7 @@ const PPB_Transport_Dev g_ppb_transport_thunk = {
 
 }  // namespace
 
-const PPB_Transport_Dev* GetPPB_Transport_Dev_Thunk() {
+const PPB_Transport_Dev_0_7* GetPPB_Transport_Dev_0_7_Thunk() {
   return &g_ppb_transport_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_udp_socket_private_thunk.cc b/ppapi/thunk/ppb_udp_socket_private_thunk.cc
index c2c4b5f..60e95fe 100644
--- a/ppapi/thunk/ppb_udp_socket_private_thunk.cc
+++ b/ppapi/thunk/ppb_udp_socket_private_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -89,10 +89,9 @@ const PPB_UDPSocket_Private g_ppb_udp_socket_thunk = {
 
 }  // namespace
 
-const PPB_UDPSocket_Private* GetPPB_UDPSocket_Private_Thunk() {
+const PPB_UDPSocket_Private_0_2* GetPPB_UDPSocket_Private_0_2_Thunk() {
   return &g_ppb_udp_socket_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi
-
diff --git a/ppapi/thunk/ppb_url_loader_thunk.cc b/ppapi/thunk/ppb_url_loader_thunk.cc
index 236144f..719d443 100644
--- a/ppapi/thunk/ppb_url_loader_thunk.cc
+++ b/ppapi/thunk/ppb_url_loader_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -139,11 +139,11 @@ const PPB_URLLoaderTrusted g_ppb_urlloader_trusted_thunk = {
 
 }  // namespace
 
-const PPB_URLLoader* GetPPB_URLLoader_Thunk() {
+const PPB_URLLoader_1_0* GetPPB_URLLoader_1_0_Thunk() {
   return &g_ppb_urlloader_thunk;
 }
 
-const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk() {
+const PPB_URLLoaderTrusted_0_3* GetPPB_URLLoaderTrusted_0_3_Thunk() {
   return &g_ppb_urlloader_trusted_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_url_request_info_thunk.cc b/ppapi/thunk/ppb_url_request_info_thunk.cc
index a5cca10..536753d 100644
--- a/ppapi/thunk/ppb_url_request_info_thunk.cc
+++ b/ppapi/thunk/ppb_url_request_info_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -66,7 +66,7 @@ const PPB_URLRequestInfo g_ppb_url_request_info_thunk = {
 
 }  // namespace
 
-const PPB_URLRequestInfo* GetPPB_URLRequestInfo_Thunk() {
+const PPB_URLRequestInfo_1_0* GetPPB_URLRequestInfo_1_0_Thunk() {
   return &g_ppb_url_request_info_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_url_response_info_thunk.cc b/ppapi/thunk/ppb_url_response_info_thunk.cc
index 3fecb936..c0b36ff 100644
--- a/ppapi/thunk/ppb_url_response_info_thunk.cc
+++ b/ppapi/thunk/ppb_url_response_info_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -39,7 +39,7 @@ const PPB_URLResponseInfo g_ppb_url_response_info_thunk = {
 
 }  // namespace
 
-const PPB_URLResponseInfo* GetPPB_URLResponseInfo_Thunk() {
+const PPB_URLResponseInfo_1_0* GetPPB_URLResponseInfo_1_0_Thunk() {
   return &g_ppb_url_response_info_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_url_util_thunk.cc b/ppapi/thunk/ppb_url_util_thunk.cc
index f1dbc27..3dc9f3a 100644
--- a/ppapi/thunk/ppb_url_util_thunk.cc
+++ b/ppapi/thunk/ppb_url_util_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -66,7 +66,7 @@ const PPB_URLUtil_Dev g_ppb_url_util = {
 
 }  // namespace
 
-const PPB_URLUtil_Dev* GetPPB_URLUtil_Dev_Thunk() {
+const PPB_URLUtil_Dev_0_6* GetPPB_URLUtil_Dev_0_6_Thunk() {
   return &g_ppb_url_util;
 }
 
diff --git a/ppapi/thunk/ppb_video_capture_thunk.cc b/ppapi/thunk/ppb_video_capture_thunk.cc
index f8704d0..fbd1f2b 100644
--- a/ppapi/thunk/ppb_video_capture_thunk.cc
+++ b/ppapi/thunk/ppb_video_capture_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -65,7 +65,7 @@ const PPB_VideoCapture_Dev g_ppb_videocapture_thunk = {
 
 }  // namespace
 
-const PPB_VideoCapture_Dev* GetPPB_VideoCapture_Dev_Thunk() {
+const PPB_VideoCapture_Dev_0_1* GetPPB_VideoCapture_Dev_0_1_Thunk() {
   return &g_ppb_videocapture_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_video_decoder_thunk.cc b/ppapi/thunk/ppb_video_decoder_thunk.cc
index e1962cd..5ff707c 100644
--- a/ppapi/thunk/ppb_video_decoder_thunk.cc
+++ b/ppapi/thunk/ppb_video_decoder_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -90,7 +90,7 @@ const PPB_VideoDecoder_Dev g_ppb_videodecoder_thunk = {
 
 }  // namespace
 
-const PPB_VideoDecoder_Dev* GetPPB_VideoDecoder_Dev_Thunk() {
+const PPB_VideoDecoder_Dev_0_16* GetPPB_VideoDecoder_Dev_0_16_Thunk() {
   return &g_ppb_videodecoder_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_video_layer_thunk.cc b/ppapi/thunk/ppb_video_layer_thunk.cc
index ea31b9f..dc1e842 100644
--- a/ppapi/thunk/ppb_video_layer_thunk.cc
+++ b/ppapi/thunk/ppb_video_layer_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -73,7 +73,7 @@ const PPB_VideoLayer_Dev g_ppb_videolayer_thunk = {
 
 }  // namespace
 
-const PPB_VideoLayer_Dev* GetPPB_VideoLayer_Dev_Thunk() {
+const PPB_VideoLayer_Dev_0_1* GetPPB_VideoLayer_Dev_0_1_Thunk() {
   return &g_ppb_videolayer_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_view_thunk.cc b/ppapi/thunk/ppb_view_thunk.cc
index 04246c5..874513b 100644
--- a/ppapi/thunk/ppb_view_thunk.cc
+++ b/ppapi/thunk/ppb_view_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -88,7 +88,7 @@ const PPB_View g_ppb_view_thunk = {
 
 }  // namespace
 
-const PPB_View* GetPPB_View_Thunk() {
+const PPB_View* GetPPB_View_1_0_Thunk() {
   return &g_ppb_view_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_websocket_thunk.cc b/ppapi/thunk/ppb_websocket_thunk.cc
index 87cb8c7..da93901 100644
--- a/ppapi/thunk/ppb_websocket_thunk.cc
+++ b/ppapi/thunk/ppb_websocket_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -144,7 +144,7 @@ const PPB_WebSocket_Dev g_ppb_websocket_thunk = {
 
 }  // namespace
 
-const PPB_WebSocket_Dev* GetPPB_WebSocket_Dev_Thunk() {
+const PPB_WebSocket_Dev_0_1* GetPPB_WebSocket_Dev_0_1_Thunk() {
   return &g_ppb_websocket_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_widget_thunk.cc b/ppapi/thunk/ppb_widget_thunk.cc
index ec77352..94833eb 100644
--- a/ppapi/thunk/ppb_widget_thunk.cc
+++ b/ppapi/thunk/ppb_widget_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -54,7 +54,7 @@ const PPB_Widget_Dev g_ppb_widget_thunk = {
 
 }  // namespace
 
-const PPB_Widget_Dev* GetPPB_Widget_Dev_Thunk() {
+const PPB_Widget_Dev_0_3* GetPPB_Widget_Dev_0_3_Thunk() {
   return &g_ppb_widget_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_zoom_thunk.cc b/ppapi/thunk/ppb_zoom_thunk.cc
index 699ad80..7ea903c 100644
--- a/ppapi/thunk/ppb_zoom_thunk.cc
+++ b/ppapi/thunk/ppb_zoom_thunk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -35,7 +35,7 @@ const PPB_Zoom_Dev g_ppb_zoom_thunk = {
 
 }  // namespace
 
-const PPB_Zoom_Dev* GetPPB_Zoom_Dev_Thunk() {
+const PPB_Zoom_Dev_0_2* GetPPB_Zoom_Dev_0_2_Thunk() {
   return &g_ppb_zoom_thunk;
 }
 
diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h
index a6a6ebb..c2394f2 100644
--- a/ppapi/thunk/thunk.h
+++ b/ppapi/thunk/thunk.h
@@ -1,10 +1,26 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 PPAPI_THUNK_THUNK_H_
 #define PPAPI_THUNK_THUNK_H_
 
+#include "ppapi/c/ppb_graphics_3d.h"
+#include "ppapi/c/private/ppb_flash_clipboard.h"
+#include "ppapi/c/private/ppb_flash_menu.h"
+#include "ppapi/c/private/ppb_flash_net_connector.h"
+#include "ppapi/c/private/ppb_flash_fullscreen.h"
+#include "ppapi/c/private/ppb_instance_private.h"
+#include "ppapi/c/private/ppb_tcp_socket_private.h"
+#include "ppapi/c/private/ppb_udp_socket_private.h"
+#include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h"
+#include "ppapi/c/trusted/ppb_audio_trusted.h"
+#include "ppapi/c/trusted/ppb_broker_trusted.h"
+#include "ppapi/c/trusted/ppb_buffer_trusted.h"
+#include "ppapi/c/trusted/ppb_file_chooser_trusted.h"
+#include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"
+#include "ppapi/c/trusted/ppb_image_data_trusted.h"
+#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 
 // Declares a getter for the interface thunk of the form:
@@ -27,48 +43,37 @@
 #undef PROXIED_IFACE
 #undef IFACE
 
-struct PPB_AudioInputTrusted_Dev;
-struct PPB_AudioTrusted;
-struct PPB_BrokerTrusted;
-struct PPB_BufferTrusted;
-struct PPB_FileChooserTrusted;
-struct PPB_Flash_Clipboard;
-struct PPB_Flash_Menu;
-struct PPB_Flash_NetConnector;
-struct PPB_Graphics3D;
-struct PPB_Graphics3DTrusted;
-struct PPB_ImageDataTrusted;
-struct PPB_Instance_Private;
-struct PPB_TCPSocket_Private;
-struct PPB_UDPSocket_Private;
-struct PPB_URLLoaderTrusted;
-
 namespace ppapi {
 namespace thunk {
 
 // Old-style thunk getters. Only put trusted/private stuff here (it hasn't
 // yet been converted to the new system). Otherwise, add the declaration to
 // the appropriate interfaces_*.h file.
-PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev*
-    GetPPB_AudioInputTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_BrokerTrusted* GetPPB_Broker_Thunk();
-PPAPI_THUNK_EXPORT const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted*
-    GetPPB_FileChooser_Trusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard* GetPPB_Flash_Clipboard_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector*
-    GetPPB_Flash_NetConnector_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted*
-    GetPPB_Graphics3DTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Instance_Private* GetPPB_Instance_Private_Thunk();
-PPAPI_THUNK_EXPORT const PPB_TCPSocket_Private*
-    GetPPB_TCPSocket_Private_Thunk();
-PPAPI_THUNK_EXPORT const PPB_UDPSocket_Private*
-    GetPPB_UDPSocket_Private_Thunk();
-PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk();
+PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev_0_1*
+    GetPPB_AudioInputTrusted_0_1_Thunk();
+PPAPI_THUNK_EXPORT const PPB_AudioTrusted_0_6* GetPPB_AudioTrusted_0_6_Thunk();
+PPAPI_THUNK_EXPORT const PPB_BrokerTrusted_0_2* GetPPB_Broker_0_2_Thunk();
+PPAPI_THUNK_EXPORT const PPB_BufferTrusted_0_1*
+    GetPPB_BufferTrusted_0_1_Thunk();
+PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted_0_5*
+    GetPPB_FileChooser_Trusted_0_5_Thunk();
+PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard_3_0*
+    GetPPB_Flash_Clipboard_3_0_Thunk();
+PPAPI_THUNK_EXPORT const PPB_Flash_Menu_0_2* GetPPB_Flash_Menu_0_2_Thunk();
+PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector_0_2*
+    GetPPB_Flash_NetConnector_0_2_Thunk();
+PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted_1_0*
+    GetPPB_Graphics3DTrusted_1_0_Thunk();
+PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted_0_4*
+    GetPPB_ImageDataTrusted_0_4_Thunk();
+PPAPI_THUNK_EXPORT const PPB_Instance_Private_0_1*
+    GetPPB_Instance_Private_0_1_Thunk();
+PPAPI_THUNK_EXPORT const PPB_TCPSocket_Private_0_3*
+    GetPPB_TCPSocket_Private_0_3_Thunk();
+PPAPI_THUNK_EXPORT const PPB_UDPSocket_Private_0_2*
+    GetPPB_UDPSocket_Private_0_2_Thunk();
+PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted_0_3*
+    GetPPB_URLLoaderTrusted_0_3_Thunk();
 
 }  // namespace thunk
 }  // namespace ppapi