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

14 files changed, 65 insertions, 73 deletions

diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 8b90fa8..55397c8 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.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.
 
@@ -296,58 +296,58 @@ const void* GetInterface(const char* name) {
 
   // Please keep alphabetized by interface macro name with "special" stuff at
   // the bottom.
-  if (strcmp(name, PPB_AUDIO_INPUT_TRUSTED_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_AudioInputTrusted_Thunk();
-  if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_AudioTrusted_Thunk();
-  if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_BufferTrusted_Thunk();
-  if (strcmp(name, PPB_CORE_INTERFACE) == 0)
+  if (strcmp(name, PPB_AUDIO_INPUT_TRUSTED_DEV_INTERFACE_0_1) == 0)
+    return ::ppapi::thunk::GetPPB_AudioInputTrusted_0_1_Thunk();
+  if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE_0_6) == 0)
+    return ::ppapi::thunk::GetPPB_AudioTrusted_0_6_Thunk();
+  if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE_0_1) == 0)
+    return ::ppapi::thunk::GetPPB_BufferTrusted_0_1_Thunk();
+  if (strcmp(name, PPB_CORE_INTERFACE_1_0) == 0)
     return &core_interface;
-  if (strcmp(name, PPB_FILECHOOSER_TRUSTED_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_FileChooser_Trusted_Thunk();
+  if (strcmp(name, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5) == 0)
+    return ::ppapi::thunk::GetPPB_FileChooser_Trusted_0_5_Thunk();
   if (strcmp(name, PPB_FLASH_INTERFACE_11_0) == 0)
     return PPB_Flash_Impl::GetInterface11();
   if (strcmp(name, PPB_FLASH_INTERFACE_12_0) == 0)
-    return PPB_Flash_Impl::GetInterface12();
-  if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_Flash_Clipboard_Thunk();
+    return PPB_Flash_Impl::GetInterface12_0();
+  if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_3_0) == 0)
+    return ::ppapi::thunk::GetPPB_Flash_Clipboard_3_0_Thunk();
   if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY) == 0)
-    return ::ppapi::thunk::GetPPB_Flash_Clipboard_Thunk();
+    return ::ppapi::thunk::GetPPB_Flash_Clipboard_3_0_Thunk();
   if (strcmp(name, PPB_FLASH_FILE_FILEREF_INTERFACE) == 0)
     return PPB_Flash_File_FileRef_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0)
     return PPB_Flash_File_ModuleLocal_Impl::GetInterface();
-  if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk();
-  if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_TCPSocket_Private_Thunk();
-  if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_Fullscreen_Thunk();
+  if (strcmp(name, PPB_FLASH_MENU_INTERFACE_0_2) == 0)
+    return ::ppapi::thunk::GetPPB_Flash_Menu_0_2_Thunk();
+  if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE_0_2) == 0)
+    return ::ppapi::thunk::GetPPB_TCPSocket_Private_0_3_Thunk();
+  if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_5) == 0)
+    return ::ppapi::thunk::GetPPB_Fullscreen_1_0_Thunk();
   if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0)
     return PPB_GpuBlacklist_Private_Impl::GetInterface();
-  if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk();
-  if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk();
+  if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE_1_0) == 0)
+    return ::ppapi::thunk::GetPPB_Graphics3DTrusted_1_0_Thunk();
+  if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE_0_4) == 0)
+    return ::ppapi::thunk::GetPPB_ImageDataTrusted_0_4_Thunk();
   if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0)
-    return ::ppapi::thunk::GetPPB_InputEvent_Thunk();
-  if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_Instance_Private_Thunk();
+    return ::ppapi::thunk::GetPPB_InputEvent_1_0_Thunk();
+  if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE_0_1) == 0)
+    return ::ppapi::thunk::GetPPB_Instance_Private_0_1_Thunk();
   if (strcmp(name, PPB_OPENGLES2_INTERFACE) == 0)
     return ::ppapi::PPB_OpenGLES2_Shared::GetInterface();
   if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0)
     return PPB_Proxy_Impl::GetInterface();
   if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0)
     return PPB_UMA_Private_Impl::GetInterface();
-  if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_URLLoaderTrusted_Thunk();
+  if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE_0_3) == 0)
+    return ::ppapi::thunk::GetPPB_URLLoaderTrusted_0_3_Thunk();
   if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0)
     return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface();
   if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0)
     return ::ppapi::PPB_Var_Shared::GetVarInterface1_0();
   if (strcmp(name, PPB_VAR_INTERFACE_1_1) == 0)
-    return ::ppapi::PPB_Var_Shared::GetVarInterface();
+    return ::ppapi::PPB_Var_Shared::GetVarInterface1_1();
   if (strcmp(name, PPB_VAR_ARRAY_BUFFER_DEV_INTERFACE) == 0)
     return ::ppapi::PPB_Var_Shared::GetVarArrayBufferInterface();
 
diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h
index c1e1c02..7634268 100644
--- a/webkit/plugins/ppapi/plugin_module.h
+++ b/webkit/plugins/ppapi/plugin_module.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.
 
@@ -20,11 +20,11 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/ppb.h"
+#include "ppapi/c/ppb_core.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 class FilePath;
-struct PPB_Core;
 typedef void* NPIdentifier;
 
 namespace ppapi {
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 8f1ff5d..63536bc 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.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.
 
@@ -956,7 +956,7 @@ bool PluginInstance::LoadMessagingInterface() {
     checked_for_plugin_messaging_interface_ = true;
     plugin_messaging_interface_ =
         static_cast<const PPP_Messaging*>(module_->GetPluginInterface(
-            PPP_MESSAGING_INTERFACE_1_0));
+            PPP_MESSAGING_INTERFACE));
   }
   return !!plugin_messaging_interface_;
 }
@@ -974,8 +974,8 @@ bool PluginInstance::LoadMouseLockInterface() {
 bool PluginInstance::LoadPdfInterface() {
   if (!plugin_pdf_interface_) {
     plugin_pdf_interface_ =
-        static_cast<const PPP_Pdf*>(module_->GetPluginInterface(
-            PPP_PDF_INTERFACE));
+        static_cast<const PPP_Pdf_1*>(module_->GetPluginInterface(
+            PPP_PDF_INTERFACE_1));
   }
 
   return !!plugin_pdf_interface_;
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 3e7f179..cbafec1 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.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,11 +17,19 @@
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
+#include "ppapi/c/dev/ppp_find_dev.h"
+#include "ppapi/c/dev/ppp_selection_dev.h"
+#include "ppapi/c/dev/ppp_zoom_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_input_event.h"
+#include "ppapi/c/ppp_graphics_3d.h"
+#include "ppapi/c/ppp_input_event.h"
+#include "ppapi/c/ppp_messaging.h"
+#include "ppapi/c/ppp_mouse_lock.h"
+#include "ppapi/c/private/ppp_instance_private.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/ppb_instance_shared.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
@@ -32,18 +40,10 @@
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/rect.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
+#include "webkit/plugins/ppapi/ppp_pdf.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 struct PP_Point;
-struct PPP_Find_Dev;
-struct PPP_Graphics3D;
-struct PPP_InputEvent;
-struct PPP_Instance_Private;
-struct PPP_Messaging;
-struct PPP_MouseLock;
-struct PPP_Pdf;
-struct PPP_Selection_Dev;
-struct PPP_Zoom_Dev;
 
 class SkBitmap;
 class TransportDIB;
diff --git a/webkit/plugins/ppapi/ppb_file_io_impl.h b/webkit/plugins/ppapi/ppb_file_io_impl.h
index c57430b..27353c6 100644
--- a/webkit/plugins/ppapi/ppb_file_io_impl.h
+++ b/webkit/plugins/ppapi/ppb_file_io_impl.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.
 
@@ -14,7 +14,6 @@
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
 struct PP_CompletionCallback;
-struct PPB_FileIO;
 
 namespace webkit {
 namespace ppapi {
diff --git a/webkit/plugins/ppapi/ppb_file_system_impl.h b/webkit/plugins/ppapi/ppb_file_system_impl.h
index 0f41561..c963ce3 100644
--- a/webkit/plugins/ppapi/ppb_file_system_impl.h
+++ b/webkit/plugins/ppapi/ppb_file_system_impl.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,11 +9,10 @@
 #include "base/compiler_specific.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/pp_file_info.h"
+#include "ppapi/c/ppb_file_system.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_file_system_api.h"
 
-struct PPB_FileSystem;
-
 namespace webkit {
 namespace ppapi {
 
diff --git a/webkit/plugins/ppapi/ppb_flash_clipboard_impl.h b/webkit/plugins/ppapi/ppb_flash_clipboard_impl.h
index 1c168fe..1d6fc47 100644
--- a/webkit/plugins/ppapi/ppb_flash_clipboard_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_clipboard_impl.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,8 +10,6 @@
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/thunk/ppb_flash_clipboard_api.h"
 
-struct PPB_Flash_Clipboard;
-
 namespace webkit {
 namespace ppapi {
 
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc
index 40b8b96..c65fbcc 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_impl.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.
 
@@ -275,7 +275,7 @@ const PPB_Flash_11* PPB_Flash_Impl::GetInterface11() {
 }
 
 // static
-const PPB_Flash* PPB_Flash_Impl::GetInterface12() {
+const PPB_Flash_12_0* PPB_Flash_Impl::GetInterface12_0() {
   return &ppb_flash_12;
 }
 
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h
index b9b00aa..b1156c8 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_impl.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.
 
@@ -19,7 +19,7 @@ class PPB_Flash_Impl {
   // Returns a pointer to the interface implementing PPB_Flash that is
   // exposed to the plugin.
   static const PPB_Flash_11* GetInterface11();
-  static const PPB_Flash* GetInterface12();
+  static const PPB_Flash_12_0* GetInterface12_0();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PPB_Flash_Impl);
diff --git a/webkit/plugins/ppapi/ppb_graphics_2d_impl.h b/webkit/plugins/ppapi/ppb_graphics_2d_impl.h
index 0257e4c..2cce83b 100644
--- a/webkit/plugins/ppapi/ppb_graphics_2d_impl.h
+++ b/webkit/plugins/ppapi/ppb_graphics_2d_impl.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.
 
@@ -15,8 +15,6 @@
 #include "ppapi/thunk/ppb_graphics_2d_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
 
-struct PPB_Graphics2D;
-
 namespace gfx {
 class Rect;
 }
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h
index ac17497..3d5c9bb 100644
--- a/webkit/plugins/ppapi/ppb_video_decoder_impl.h
+++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.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,6 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/dev/pp_video_dev.h"
+#include "ppapi/c/dev/ppp_video_decoder_dev.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppb_video_decoder_shared.h"
 #include "ppapi/shared_impl/resource.h"
@@ -19,8 +20,6 @@
 
 struct PP_PictureBuffer_Dev;
 struct PP_VideoBitstreamBuffer_Dev;
-struct PPB_VideoDecoder_Dev;
-struct PPP_VideoDecoder_Dev;
 
 namespace gpu {
 namespace gles2 {
diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.h b/webkit/plugins/ppapi/ppb_websocket_impl.h
index 7ac9acd..c33df7f 100644
--- a/webkit/plugins/ppapi/ppb_websocket_impl.h
+++ b/webkit/plugins/ppapi/ppb_websocket_impl.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/thunk/ppb_websocket_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketClient.h"
 
-struct PPB_Var;
-
 namespace ppapi {
 class StringVar;
 }
diff --git a/webkit/plugins/ppapi/ppp_pdf.h b/webkit/plugins/ppapi/ppp_pdf.h
index 6405225..de491190 100644
--- a/webkit/plugins/ppapi/ppp_pdf.h
+++ b/webkit/plugins/ppapi/ppp_pdf.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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,12 +9,14 @@
 #include "ppapi/c/pp_point.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPP_PDF_INTERFACE "PPP_Pdf;1"
+#define PPP_PDF_INTERFACE_1 "PPP_Pdf;1"
 
-struct PPP_Pdf {
+struct PPP_Pdf_1 {
   // Returns an absolute URL if the position is over a link.
   PP_Var (*GetLinkAtPosition)(PP_Instance instance,
                               PP_Point point);
 };
 
+typedef PPP_Pdf_1 PPP_Pdf;
+
 #endif  // WEBKIT_PLUGINS_PPAPI_PPP_PDF_H_
diff --git a/webkit/plugins/ppapi/url_request_info_unittest.cc b/webkit/plugins/ppapi/url_request_info_unittest.cc
index c7f1720..21fd92c 100644
--- a/webkit/plugins/ppapi/url_request_info_unittest.cc
+++ b/webkit/plugins/ppapi/url_request_info_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.
 
@@ -123,7 +123,7 @@ WebFrame* URLRequestInfoTest::frame_;
 
 TEST_F(URLRequestInfoTest, GetInterface) {
   const PPB_URLRequestInfo* request_info =
-      ::ppapi::thunk::GetPPB_URLRequestInfo_Thunk();
+      ::ppapi::thunk::GetPPB_URLRequestInfo_1_0_Thunk();
   EXPECT_TRUE(request_info);
   EXPECT_TRUE(request_info->Create);
   EXPECT_TRUE(request_info->IsURLRequestInfo);
@@ -257,4 +257,3 @@ TEST_F(URLRequestInfoTest, SetHeaders) {
 
 }  // namespace ppapi
 }  // namespace webkit
-