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

23 files changed, 62 insertions, 85 deletions

diff --git a/ppapi/proxy/host_var_serialization_rules.h b/ppapi/proxy/host_var_serialization_rules.h
index 70e9a7b..9c4db2e 100644
--- a/ppapi/proxy/host_var_serialization_rules.h
+++ b/ppapi/proxy/host_var_serialization_rules.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.
 
@@ -9,10 +9,9 @@
 
 #include "base/basictypes.h"
 #include "ppapi/c/pp_module.h"
+#include "ppapi/c/ppb_var.h"
 #include "ppapi/proxy/var_serialization_rules.h"
 
-struct PPB_Var;
-
 namespace ppapi {
 namespace proxy {
 
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 436cbc5c..bbba6bb 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.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.
 
@@ -165,12 +165,12 @@ InterfaceList::InterfaceList() {
   // proxy and the impl and there's no obvious message routing.
   AddProxy(API_ID_RESOURCE_CREATION, &ResourceCreationProxy::Create);
   AddProxy(API_ID_PPP_CLASS, &PPP_Class_Proxy::Create);
-  AddPPB(PPB_CORE_INTERFACE, API_ID_PPB_CORE,
+  AddPPB(PPB_CORE_INTERFACE_1_0, API_ID_PPB_CORE,
          PPB_Core_Proxy::GetPPB_Core_Interface());
-  AddPPB(PPB_OPENGLES2_INTERFACE, API_ID_NONE,
+  AddPPB(PPB_OPENGLES2_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetInterface());
-  AddPPB(PPB_VAR_INTERFACE, API_ID_NONE,
-         PPB_Var_Shared::GetVarInterface());
+  AddPPB(PPB_VAR_INTERFACE_1_1, API_ID_NONE,
+         PPB_Var_Shared::GetVarInterface1_1());
   AddPPB(PPB_VAR_INTERFACE_1_0, API_ID_NONE,
          PPB_Var_Shared::GetVarInterface1_0());
 
@@ -257,14 +257,14 @@ void InterfaceList::AddFlashInterfaces() {
   AddPPB(PPB_FLASH_INTERFACE_11_0, API_ID_PPB_FLASH,
          PPB_Flash_Proxy::GetInterface11());
   AddPPB(PPB_FLASH_INTERFACE_12_0, API_ID_PPB_FLASH,
-         PPB_Flash_Proxy::GetInterface12());
+         PPB_Flash_Proxy::GetInterface12_0());
 
   AddProxy(API_ID_PPB_FLASH_CLIPBOARD,
            &ProxyFactory<PPB_Flash_Clipboard_Proxy>);
-  AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE, API_ID_PPB_FLASH_CLIPBOARD,
-         thunk::GetPPB_Flash_Clipboard_Thunk());
+  AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE_3_0, API_ID_PPB_FLASH_CLIPBOARD,
+         thunk::GetPPB_Flash_Clipboard_3_0_Thunk());
   AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY, API_ID_PPB_FLASH_CLIPBOARD,
-         thunk::GetPPB_Flash_Clipboard_Thunk());
+         thunk::GetPPB_Flash_Clipboard_3_0_Thunk());
 
   AddProxy(API_ID_PPB_FLASH_FILE_FILEREF,
            &ProxyFactory<PPB_Flash_File_FileRef_Proxy>);
@@ -278,18 +278,18 @@ void InterfaceList::AddFlashInterfaces() {
          PPB_Flash_File_ModuleLocal_Proxy::GetInterface());
 
   AddProxy(API_ID_PPB_FLASH_MENU, &ProxyFactory<PPB_Flash_Menu_Proxy>);
-  AddPPB(PPB_FLASH_MENU_INTERFACE, API_ID_PPB_FLASH_MENU,
-         thunk::GetPPB_Flash_Menu_Thunk());
+  AddPPB(PPB_FLASH_MENU_INTERFACE_0_2, API_ID_PPB_FLASH_MENU,
+         thunk::GetPPB_Flash_Menu_0_2_Thunk());
 
-  // Only add PPB because proxy for the this API ID was already added.
-  AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE, API_ID_PPB_TCPSOCKET_PRIVATE,
-         thunk::GetPPB_TCPSocket_Private_Thunk());
+  // Only add the interface; PPB_TCPSocket_Private provides the API ID's proxy.
+  AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE_0_2, API_ID_PPB_TCPSOCKET_PRIVATE,
+         thunk::GetPPB_TCPSocket_Private_0_3_Thunk());
 
 #ifdef ENABLE_FLAPPER_HACKS
   AddProxy(API_ID_PPB_FLASH_NETCONNECTOR,
            &ProxyFactory<PPB_Flash_NetConnector_Proxy>);
-  AddPPB(PPB_FLASH_NETCONNECTOR_INTERFACE, API_ID_PPB_FLASH_NETCONNECTOR,
-         thunk::GetPPB_Flash_NetConnector_Thunk());
+  AddPPB(PPB_FLASH_NETCONNECTOR_INTERFACE_0_2, API_ID_PPB_FLASH_NETCONNECTOR,
+         thunk::GetPPB_Flash_NetConnector_0_2_Thunk());
 #endif
 }
 
diff --git a/ppapi/proxy/ppb_audio_input_proxy.h b/ppapi/proxy/ppb_audio_input_proxy.h
index 6244e55..415cb14 100644
--- a/ppapi/proxy/ppb_audio_input_proxy.h
+++ b/ppapi/proxy/ppb_audio_input_proxy.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.
 
@@ -17,8 +17,6 @@
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 
-struct PPB_AudioInput_Dev;
-
 namespace ppapi {
 
 class HostResource;
diff --git a/ppapi/proxy/ppb_audio_proxy.h b/ppapi/proxy/ppb_audio_proxy.h
index feee8dc..6ec9b44 100644
--- a/ppapi/proxy/ppb_audio_proxy.h
+++ b/ppapi/proxy/ppb_audio_proxy.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.
 
@@ -12,16 +12,12 @@
 #include "base/sync_socket.h"
 #include "ipc/ipc_platform_file.h"
 #include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppb_audio.h"
-#include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 
-struct PPB_Audio;
-
 namespace ppapi {
 
 class HostResource;
diff --git a/ppapi/proxy/ppb_core_proxy.h b/ppapi/proxy/ppb_core_proxy.h
index 3e1cfae..a564519 100644
--- a/ppapi/proxy/ppb_core_proxy.h
+++ b/ppapi/proxy/ppb_core_proxy.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.
 
@@ -12,8 +12,6 @@
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/shared_impl/host_resource.h"
 
-struct PPB_Core;
-
 namespace ppapi {
 namespace proxy {
 
diff --git a/ppapi/proxy/ppb_file_chooser_proxy.cc b/ppapi/proxy/ppb_file_chooser_proxy.cc
index 734fb14..7361835 100644
--- a/ppapi/proxy/ppb_file_chooser_proxy.cc
+++ b/ppapi/proxy/ppb_file_chooser_proxy.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.
 
@@ -171,8 +171,8 @@ PPB_FileChooser_Proxy::~PPB_FileChooser_Proxy() {
 // static
 const InterfaceProxy::Info* PPB_FileChooser_Proxy::GetTrustedInfo() {
   static const Info info = {
-    thunk::GetPPB_FileChooser_Trusted_Thunk(),
-    PPB_FILECHOOSER_TRUSTED_INTERFACE,
+    thunk::GetPPB_FileChooser_Trusted_0_5_Thunk(),
+    PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5,
     API_ID_NONE,  // FILE_CHOOSER is the canonical one.
     false,
     &CreateFileChooserProxy
diff --git a/ppapi/proxy/ppb_file_system_proxy.cc b/ppapi/proxy/ppb_file_system_proxy.cc
index dea7409..32aff7c 100644
--- a/ppapi/proxy/ppb_file_system_proxy.cc
+++ b/ppapi/proxy/ppb_file_system_proxy.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,8 +120,8 @@ PPB_FileSystem_Proxy::~PPB_FileSystem_Proxy() {
 
 const InterfaceProxy::Info* PPB_FileSystem_Proxy::GetInfo() {
   static const Info info = {
-    thunk::GetPPB_FileSystem_Thunk(),
-    PPB_FILESYSTEM_INTERFACE,
+    thunk::GetPPB_FileSystem_1_0_Thunk(),
+    PPB_FILESYSTEM_INTERFACE_1_0,
     API_ID_PPB_FILE_SYSTEM,
     false,
     &CreateFileSystemProxy,
diff --git a/ppapi/proxy/ppb_flash_clipboard_proxy.h b/ppapi/proxy/ppb_flash_clipboard_proxy.h
index c337f82..08db677 100644
--- a/ppapi/proxy/ppb_flash_clipboard_proxy.h
+++ b/ppapi/proxy/ppb_flash_clipboard_proxy.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.
 
@@ -9,8 +9,6 @@
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/thunk/ppb_flash_clipboard_api.h"
 
-struct PPB_Flash_Clipboard;
-
 namespace ppapi {
 namespace proxy {
 
diff --git a/ppapi/proxy/ppb_flash_menu_proxy.h b/ppapi/proxy/ppb_flash_menu_proxy.h
index 7e72fde..a404141 100644
--- a/ppapi/proxy/ppb_flash_menu_proxy.h
+++ b/ppapi/proxy/ppb_flash_menu_proxy.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.
 
@@ -10,7 +10,6 @@
 
 struct PP_Flash_Menu;
 struct PP_Point;
-struct PPB_Flash_Menu;
 
 namespace ppapi {
 
diff --git a/ppapi/proxy/ppb_flash_net_connector_proxy.h b/ppapi/proxy/ppb_flash_net_connector_proxy.h
index 0f24466..db518fa 100644
--- a/ppapi/proxy/ppb_flash_net_connector_proxy.h
+++ b/ppapi/proxy/ppb_flash_net_connector_proxy.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.
 
@@ -12,8 +12,6 @@
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 
-struct PPB_Flash_NetConnector;
-
 namespace ppapi {
 
 class HostResource;
diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc
index 97f7711e..19eabcf 100644
--- a/ppapi/proxy/ppb_flash_proxy.cc
+++ b/ppapi/proxy/ppb_flash_proxy.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.
 
@@ -231,7 +231,7 @@ const PPB_Flash_11* PPB_Flash_Proxy::GetInterface11() {
 }
 
 // static
-const PPB_Flash* PPB_Flash_Proxy::GetInterface12() {
+const PPB_Flash* PPB_Flash_Proxy::GetInterface12_0() {
   return &flash_interface_12;
 }
 
diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h
index 1939b22..f3453a8 100644
--- a/ppapi/proxy/ppb_flash_proxy.h
+++ b/ppapi/proxy/ppb_flash_proxy.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.
 
@@ -13,12 +13,10 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_time.h"
+#include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/shared_impl/host_resource.h"
 
-struct PPB_Flash;
-struct PPB_Flash_11;
-
 namespace ppapi {
 
 struct PPB_URLRequestInfo_Data;
@@ -35,7 +33,7 @@ class PPB_Flash_Proxy : public InterfaceProxy {
 
   // Returns the corresponding version of the Flash interface pointer.
   static const PPB_Flash_11* GetInterface11();
-  static const PPB_Flash* GetInterface12();
+  static const PPB_Flash_12_0* GetInterface12_0();
 
   // InterfaceProxy implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg);
diff --git a/ppapi/proxy/ppb_graphics_2d_proxy.h b/ppapi/proxy/ppb_graphics_2d_proxy.h
index 2897595..f4629ba 100644
--- a/ppapi/proxy/ppb_graphics_2d_proxy.h
+++ b/ppapi/proxy/ppb_graphics_2d_proxy.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.
 
@@ -12,12 +12,12 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 #include "ppapi/shared_impl/host_resource.h"
 
-struct PPB_Graphics2D;
 struct PP_Point;
 struct PP_Rect;
 
diff --git a/ppapi/proxy/ppb_image_data_proxy.h b/ppapi/proxy/ppb_image_data_proxy.h
index 6fd64f6..7890641 100644
--- a/ppapi/proxy/ppb_image_data_proxy.h
+++ b/ppapi/proxy/ppb_image_data_proxy.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.
 
@@ -13,13 +13,13 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/c/ppb_image_data.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/serialized_structs.h"
 #include "ppapi/shared_impl/ppb_image_data_shared.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 
-struct PPB_ImageData;
 class TransportDIB;
 
 namespace skia {
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index c6f5c27..f8dd8a2 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.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.
 
@@ -53,8 +53,8 @@ PPB_Instance_Proxy::~PPB_Instance_Proxy() {
 // static
 const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoPrivate() {
   static const Info info = {
-    ppapi::thunk::GetPPB_Instance_Private_Thunk(),
-    PPB_INSTANCE_PRIVATE_INTERFACE,
+    ppapi::thunk::GetPPB_Instance_Private_0_1_Thunk(),
+    PPB_INSTANCE_PRIVATE_INTERFACE_0_1,
     API_ID_NONE,  // 1_0 is the canonical one.
     false,
     &CreateInstanceProxy,
diff --git a/ppapi/proxy/ppb_testing_proxy.h b/ppapi/proxy/ppb_testing_proxy.h
index ffbd73f..c6dd373 100644
--- a/ppapi/proxy/ppb_testing_proxy.h
+++ b/ppapi/proxy/ppb_testing_proxy.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.
 
@@ -8,11 +8,11 @@
 #include "base/basictypes.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
+#include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/shared_impl/host_resource.h"
 
 struct PP_Point;
-struct PPB_Testing_Dev;
 
 namespace ppapi {
 
diff --git a/ppapi/proxy/ppb_url_loader_proxy.cc b/ppapi/proxy/ppb_url_loader_proxy.cc
index be51288..a09799b 100644
--- a/ppapi/proxy/ppb_url_loader_proxy.cc
+++ b/ppapi/proxy/ppb_url_loader_proxy.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.
 
@@ -388,8 +388,8 @@ PP_Resource PPB_URLLoader_Proxy::TrackPluginResource(
 // static
 const InterfaceProxy::Info* PPB_URLLoader_Proxy::GetTrustedInfo() {
   static const Info info = {
-    thunk::GetPPB_URLLoaderTrusted_Thunk(),
-    PPB_URLLOADERTRUSTED_INTERFACE,
+    thunk::GetPPB_URLLoaderTrusted_0_3_Thunk(),
+    PPB_URLLOADERTRUSTED_INTERFACE_0_3,
     API_ID_NONE,  // URL_LOADER is the canonical one.
     false,
     &CreateURLLoaderProxy
diff --git a/ppapi/proxy/ppb_url_loader_proxy.h b/ppapi/proxy/ppb_url_loader_proxy.h
index e13b1a3..ef57fc6 100644
--- a/ppapi/proxy/ppb_url_loader_proxy.h
+++ b/ppapi/proxy/ppb_url_loader_proxy.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,14 +11,13 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/c/ppb_url_loader.h"
+#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 #include "ppapi/shared_impl/host_resource.h"
 
-struct PPB_URLLoader;
-struct PPB_URLLoaderTrusted;
-
 namespace ppapi {
 
 struct PPB_URLRequestInfo_Data;
diff --git a/ppapi/proxy/ppb_url_response_info_proxy.h b/ppapi/proxy/ppb_url_response_info_proxy.h
index 2351715..86c27fb 100644
--- a/ppapi/proxy/ppb_url_response_info_proxy.h
+++ b/ppapi/proxy/ppb_url_response_info_proxy.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.
 
@@ -12,8 +12,6 @@
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/shared_impl/host_resource.h"
 
-struct PPB_URLResponseInfo;
-
 namespace ppapi {
 
 struct PPB_FileRef_CreateInfo;
diff --git a/ppapi/proxy/ppb_var_unittest.cc b/ppapi/proxy/ppb_var_unittest.cc
index b573fdc..bf6147d 100644
--- a/ppapi/proxy/ppb_var_unittest.cc
+++ b/ppapi/proxy/ppb_var_unittest.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.
 
@@ -30,7 +30,7 @@ class PPB_VarTest : public PluginProxyTest {
  public:
   PPB_VarTest()
       : test_strings_(kNumStrings), vars_(kNumStrings),
-        ppb_var_(ppapi::PPB_Var_Shared::GetVarInterface()) {
+        ppb_var_(ppapi::PPB_Var_Shared::GetVarInterface1_1()) {
     // Set the value of test_strings_[i] to "i".
     for (size_t i = 0; i < kNumStrings; ++i)
       test_strings_[i] = base::IntToString(i);
@@ -102,7 +102,7 @@ class CreateVarThreadDelegate : public base::PlatformThread::Delegate {
   }
   virtual ~CreateVarThreadDelegate() {}
   virtual void ThreadMain() {
-    const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface();
+    const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface1_1();
     for (size_t i = 0; i < size_; ++i) {
       vars_out_[i] = ppb_var->VarFromUtf8(strings_in_[i].c_str(),
                                           strings_in_[i].length());
@@ -125,7 +125,7 @@ class ChangeRefVarThreadDelegate : public base::PlatformThread::Delegate {
   }
   virtual ~ChangeRefVarThreadDelegate() {}
   virtual void ThreadMain() {
-    const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface();
+    const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface1_1();
     // Increment and decrement the reference count for each var kRefsToAdd
     // times. Note that we always AddRef once before doing the matching Release,
     // to ensure that we never accidentally release the last reference.
@@ -153,7 +153,7 @@ class RemoveRefVarThreadDelegate : public base::PlatformThread::Delegate {
   }
   virtual ~RemoveRefVarThreadDelegate() {}
   virtual void ThreadMain() {
-    const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface();
+    const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface1_1();
     for (size_t i = 0; i < kNumStrings; ++i) {
       ppb_var->Release(vars_[i]);
     }
@@ -243,4 +243,3 @@ TEST_F(PPB_VarTest, DISABLED_Threads) {
 
 }  // namespace proxy
 }  // namespace ppapi
-
diff --git a/ppapi/proxy/ppp_input_event_proxy.h b/ppapi/proxy/ppp_input_event_proxy.h
index ffe5e868..a7cc054 100644
--- a/ppapi/proxy/ppp_input_event_proxy.h
+++ b/ppapi/proxy/ppp_input_event_proxy.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.
 
@@ -6,10 +6,9 @@
 #define PPAPI_PROXY_PPP_INPUT_EVENT_PROXY_H_
 
 #include "ppapi/c/pp_instance.h"
+#include "ppapi/c/ppp_input_event.h"
 #include "ppapi/proxy/interface_proxy.h"
 
-struct PPP_InputEvent;
-
 namespace ppapi {
 
 struct InputEventData;
diff --git a/ppapi/proxy/ppp_messaging_proxy.h b/ppapi/proxy/ppp_messaging_proxy.h
index bc898f31..f9390a4 100644
--- a/ppapi/proxy/ppp_messaging_proxy.h
+++ b/ppapi/proxy/ppp_messaging_proxy.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.
 
@@ -6,10 +6,9 @@
 #define PPAPI_PROXY_PPP_MESSAGING_PROXY_H_
 
 #include "ppapi/c/pp_instance.h"
+#include "ppapi/c/ppp_messaging.h"
 #include "ppapi/proxy/interface_proxy.h"
 
-struct PPP_Messaging;
-
 namespace ppapi {
 namespace proxy {
 
diff --git a/ppapi/proxy/ppp_mouse_lock_proxy.h b/ppapi/proxy/ppp_mouse_lock_proxy.h
index 75a84f7..f9b0be2 100644
--- a/ppapi/proxy/ppp_mouse_lock_proxy.h
+++ b/ppapi/proxy/ppp_mouse_lock_proxy.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.
 
@@ -6,10 +6,9 @@
 #define PPAPI_PROXY_PPP_MOUSE_LOCK_PROXY_H_
 
 #include "ppapi/c/pp_instance.h"
+#include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/proxy/interface_proxy.h"
 
-struct PPP_MouseLock;
-
 namespace ppapi {
 namespace proxy {