Rename NaCl/pepper gamepad interface from _dev to stable

Following API review, and revisions here:
https://chromiumcodereview.appspot.com/9405033/. This change is just the
mechanical renames and bump of version number to 1.0.

BUG=112879, 115119


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

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

28 files changed, 85 insertions, 86 deletions

diff --git a/native_client_sdk/src/examples/gamepad/gamepad.cc b/native_client_sdk/src/examples/gamepad/gamepad.cc
index 9ee653e..4fc70f9 100644
--- a/native_client_sdk/src/examples/gamepad/gamepad.cc
+++ b/native_client_sdk/src/examples/gamepad/gamepad.cc
@@ -10,7 +10,7 @@
 #include <cmath>
 #include <cstring>
 #include <string>
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/var.h"
 
@@ -35,8 +35,8 @@ Gamepad::Gamepad(PP_Instance instance)
       quit_(false) {
   pp::Module* module = pp::Module::Get();
   assert(module);
-  gamepad_ = static_cast<const PPB_Gamepad_Dev*>(
-      module->GetBrowserInterface(PPB_GAMEPAD_DEV_INTERFACE));
+  gamepad_ = static_cast<const PPB_Gamepad*>(
+      module->GetBrowserInterface(PPB_GAMEPAD_INTERFACE));
   assert(gamepad_);
 }
 
@@ -84,7 +84,7 @@ void Gamepad::Paint() {
   FillRect(pixel_buffer_, 0, 0, width(), height(), 0xfff0f0f0);
 
   // Get current gamepad data.
-  PP_GamepadsSampleData_Dev gamepad_data;
+  PP_GamepadsSampleData gamepad_data;
   gamepad_->Sample(pp_instance(), &gamepad_data);
 
   // Draw the current state for each connected gamepad.
@@ -92,7 +92,7 @@ void Gamepad::Paint() {
     int width2 = width() / gamepad_data.length / 2;
     int height2 = height() / 2;
     int offset = width2 * 2 * p;
-    PP_GamepadSampleData_Dev& pad = gamepad_data.items[p];
+    PP_GamepadSampleData& pad = gamepad_data.items[p];
 
     if (!pad.connected)
       continue;
diff --git a/native_client_sdk/src/examples/gamepad/gamepad.h b/native_client_sdk/src/examples/gamepad/gamepad.h
index e5a5e3a..4c9f367 100644
--- a/native_client_sdk/src/examples/gamepad/gamepad.h
+++ b/native_client_sdk/src/examples/gamepad/gamepad.h
@@ -7,7 +7,7 @@
 
 #include <map>
 #include <vector>
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance.h"
@@ -70,7 +70,7 @@ class Gamepad : public pp::Instance {
 
   pp::Graphics2D* graphics_2d_context_;
   pp::ImageData* pixel_buffer_;
-  const PPB_Gamepad_Dev* gamepad_;
+  const PPB_Gamepad* gamepad_;
   bool flush_pending_;
   bool quit_;
 };
diff --git a/ppapi/api/dev/ppb_gamepad_dev.idl b/ppapi/api/ppb_gamepad.idl
index a9b5918..845714b 100644
--- a/ppapi/api/dev/ppb_gamepad_dev.idl
+++ b/ppapi/api/ppb_gamepad.idl
@@ -4,19 +4,19 @@
  */
 
 /**
- * This file defines the <code>PPB_Gamepad_Dev</code> interface, which
+ * This file defines the <code>PPB_Gamepad</code> interface, which
  * provides access to gamepad devices.
  */
 
 label Chrome {
-  M19 = 0.2
+  M19 = 1.0
 };
 
 /**
  * The data for one gamepad device.
  */
 [assert_size(472)]
-struct PP_GamepadSampleData_Dev {
+struct PP_GamepadSampleData {
     /**
      * Number of valid elements in the |axes| array.
      */
@@ -64,7 +64,7 @@ struct PP_GamepadSampleData_Dev {
  * The data for all gamepads connected to the system.
  */
 [assert_size(1896)]
-struct PP_GamepadsSampleData_Dev {
+struct PP_GamepadsSampleData {
     /**
      * Number of valid elements in the |items| array.
      */
@@ -76,20 +76,20 @@ struct PP_GamepadsSampleData_Dev {
     /**
      * Data for an individual gamepad device connected to the system.
      */
-    PP_GamepadSampleData_Dev[4] items;
+    PP_GamepadSampleData[4] items;
 };
 
 /**
- * The <code>PPB_Gamepad_Dev</code> interface allows retrieving data from
+ * The <code>PPB_Gamepad</code> interface allows retrieving data from
  * gamepad/joystick devices that are connected to the system.
  */
-[version=0.2, macro="PPB_GAMEPAD_DEV_INTERFACE"]
-interface PPB_Gamepad_Dev {
+[version=1.0, macro="PPB_GAMEPAD_INTERFACE"]
+interface PPB_Gamepad {
   /**
    * Samples the current state of the connected gamepads.
    */
   void Sample(
       [in] PP_Instance instance,
-      [out] PP_GamepadsSampleData_Dev data);
+      [out] PP_GamepadsSampleData data);
 
 };
diff --git a/ppapi/c/dev/ppb_gamepad_dev.h b/ppapi/c/ppb_gamepad.h
index 33a0f4c..6726568 100644
--- a/ppapi/c/dev/ppb_gamepad_dev.h
+++ b/ppapi/c/ppb_gamepad.h
@@ -3,22 +3,22 @@
  * found in the LICENSE file.
  */
 
-/* From dev/ppb_gamepad_dev.idl modified Mon Feb 27 13:23:13 2012. */
+/* From ppb_gamepad.idl modified Thu Mar  1 11:41:21 2012. */
 
-#ifndef PPAPI_C_DEV_PPB_GAMEPAD_DEV_H_
-#define PPAPI_C_DEV_PPB_GAMEPAD_DEV_H_
+#ifndef PPAPI_C_PPB_GAMEPAD_H_
+#define PPAPI_C_PPB_GAMEPAD_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_GAMEPAD_DEV_INTERFACE_0_2 "PPB_Gamepad(Dev);0.2"
-#define PPB_GAMEPAD_DEV_INTERFACE PPB_GAMEPAD_DEV_INTERFACE_0_2
+#define PPB_GAMEPAD_INTERFACE_1_0 "PPB_Gamepad;1.0"
+#define PPB_GAMEPAD_INTERFACE PPB_GAMEPAD_INTERFACE_1_0
 
 /**
  * @file
- * This file defines the <code>PPB_Gamepad_Dev</code> interface, which
+ * This file defines the <code>PPB_Gamepad</code> interface, which
  * provides access to gamepad devices.
  */
 
@@ -30,7 +30,7 @@
 /**
  * The data for one gamepad device.
  */
-struct PP_GamepadSampleData_Dev {
+struct PP_GamepadSampleData {
   /**
    * Number of valid elements in the |axes| array.
    */
@@ -66,12 +66,12 @@ struct PP_GamepadSampleData_Dev {
   /* Padding to make the struct the same size between 64 and 32. */
   char unused_pad_[4];
 };
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_GamepadSampleData_Dev, 472);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_GamepadSampleData, 472);
 
 /**
  * The data for all gamepads connected to the system.
  */
-struct PP_GamepadsSampleData_Dev {
+struct PP_GamepadsSampleData {
   /**
    * Number of valid elements in the |items| array.
    */
@@ -81,9 +81,9 @@ struct PP_GamepadsSampleData_Dev {
   /**
    * Data for an individual gamepad device connected to the system.
    */
-  struct PP_GamepadSampleData_Dev items[4];
+  struct PP_GamepadSampleData items[4];
 };
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_GamepadsSampleData_Dev, 1896);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_GamepadsSampleData, 1896);
 /**
  * @}
  */
@@ -93,20 +93,20 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_GamepadsSampleData_Dev, 1896);
  * @{
  */
 /**
- * The <code>PPB_Gamepad_Dev</code> interface allows retrieving data from
+ * The <code>PPB_Gamepad</code> interface allows retrieving data from
  * gamepad/joystick devices that are connected to the system.
  */
-struct PPB_Gamepad_Dev_0_2 {
+struct PPB_Gamepad_1_0 {
   /**
    * Samples the current state of the connected gamepads.
    */
-  void (*Sample)(PP_Instance instance, struct PP_GamepadsSampleData_Dev* data);
+  void (*Sample)(PP_Instance instance, struct PP_GamepadsSampleData* data);
 };
 
-typedef struct PPB_Gamepad_Dev_0_2 PPB_Gamepad_Dev;
+typedef struct PPB_Gamepad_1_0 PPB_Gamepad;
 /**
  * @}
  */
 
-#endif  /* PPAPI_C_DEV_PPB_GAMEPAD_DEV_H_ */
+#endif  /* PPAPI_C_PPB_GAMEPAD_H_ */
 
diff --git a/ppapi/examples/gamepad/gamepad.cc b/ppapi/examples/gamepad/gamepad.cc
index 7006dd1..eb2c8fc 100644
--- a/ppapi/examples/gamepad/gamepad.cc
+++ b/ppapi/examples/gamepad/gamepad.cc
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "ppapi/c/dev/ppb_console_dev.h"
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/graphics_2d.h"
@@ -45,8 +45,8 @@ class MyInstance : public pp::Instance {
   virtual ~MyInstance() {}
 
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
-    gamepad_ = reinterpret_cast<const PPB_Gamepad_Dev*>(
-        pp::Module::Get()->GetBrowserInterface(PPB_GAMEPAD_DEV_INTERFACE));
+    gamepad_ = reinterpret_cast<const PPB_Gamepad*>(
+        pp::Module::Get()->GetBrowserInterface(PPB_GAMEPAD_INTERFACE));
     if (!gamepad_)
       return false;
     return true;
@@ -89,7 +89,7 @@ class MyInstance : public pp::Instance {
     if (image.is_null())
       return image;
 
-    PP_GamepadsSampleData_Dev gamepad_data;
+    PP_GamepadsSampleData gamepad_data;
     gamepad_->Sample(pp_instance(), &gamepad_data);
 
     if (gamepad_data.length > 1 && gamepad_data.items[0].connected) {
@@ -121,7 +121,7 @@ class MyInstance : public pp::Instance {
 
   pp::CompletionCallbackFactory<MyInstance> callback_factory_;
 
-  const PPB_Gamepad_Dev* gamepad_;
+  const PPB_Gamepad* gamepad_;
 
   pp::Graphics2D device_context_;
 };
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
index ad33dc7..02d4eb7 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
@@ -388,10 +388,10 @@ const PPB_Fullscreen* PPBFullscreenInterface() {
   return ppb;
 }
 
-const PPB_Gamepad_Dev* PPBGamepadInterface() {
-  static const PPB_Gamepad_Dev* ppb =
-      static_cast<const PPB_Gamepad_Dev*>(
-          GetBrowserInterfaceSafe(PPB_GAMEPAD_DEV_INTERFACE));
+const PPB_Gamepad* PPBGamepadInterface() {
+  static const PPB_Gamepad* ppb =
+      static_cast<const PPB_Gamepad*>(
+          GetBrowserInterfaceSafe(PPB_GAMEPAD_INTERFACE));
   return ppb;
 }
 
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h
index d0bcaee..862c887 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h
@@ -8,7 +8,6 @@
 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
 #include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
@@ -22,6 +21,7 @@
 #include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/ppb_file_system.h"
 #include "ppapi/c/ppb_fullscreen.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/c/ppb_graphics_3d.h"
 #include "ppapi/c/ppb_image_data.h"
@@ -108,7 +108,7 @@ const PPB_FileSystem* PPBFileSystemInterface();
 const PPB_Find_Dev* PPBFindInterface();
 const PPB_Font_Dev* PPBFontInterface();
 const PPB_Fullscreen* PPBFullscreenInterface();
-const PPB_Gamepad_Dev* PPBGamepadInterface();
+const PPB_Gamepad* PPBGamepadInterface();
 const PPB_Graphics2D* PPBGraphics2DInterface();
 const PPB_Graphics3D* PPBGraphics3DInterface();
 const PPB_Graphics3DTrusted* PPBGraphics3DTrustedInterface();
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc
index 7ef24ca..dfaebe6 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc
@@ -6,13 +6,13 @@
 
 #include "native_client/src/shared/ppapi_proxy/browser_globals.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "srpcgen/ppb_rpc.h"
 
 using ppapi_proxy::DebugPrintf;
 using ppapi_proxy::PPBGamepadInterface;
 
-void PpbGamepadRpcServer::PPB_Gamepad_SampleGamepads(
+void PpbGamepadRpcServer::PPB_Gamepad_Sample(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
       // inputs
@@ -21,12 +21,12 @@ void PpbGamepadRpcServer::PPB_Gamepad_SampleGamepads(
       nacl_abi_size_t* pads_bytes, char* pads) {
   NaClSrpcClosureRunner runner(done);
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
-  if (*pads_bytes != sizeof(struct PP_GamepadsSampleData_Dev))
+  if (*pads_bytes != sizeof(struct PP_GamepadsSampleData))
     return;
 
   PPBGamepadInterface()->Sample(
       instance,
-      reinterpret_cast<struct PP_GamepadsSampleData_Dev*>(pads));
+      reinterpret_cast<struct PP_GamepadsSampleData*>(pads));
   DebugPrintf("PPB_Gamepad::SampleGamepads\n");
 
   rpc->result = NACL_SRPC_RESULT_OK;
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc
index e48aad8..63a3dc9 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc
@@ -70,7 +70,7 @@ InterfaceMapElement interface_map[] = {
   { PPB_FIND_DEV_INTERFACE, PluginFind::GetInterface(), true },
   { PPB_FONT_DEV_INTERFACE, PluginFont::GetInterface(), true },
   { PPB_FULLSCREEN_INTERFACE, PluginFullscreen::GetInterface(), true },
-  { PPB_GAMEPAD_DEV_INTERFACE, PluginGamepad::GetInterface(), true },
+  { PPB_GAMEPAD_INTERFACE, PluginGamepad::GetInterface(), true },
   { PPB_GRAPHICS_2D_INTERFACE, PluginGraphics2D::GetInterface(), true },
   { PPB_GRAPHICS_3D_INTERFACE, PluginGraphics3D::GetInterface(), true },
   { PPB_IMAGEDATA_INTERFACE, PluginImageData::GetInterface(), true },
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc
index 2e2256b..5d15d2b 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc
@@ -7,7 +7,6 @@
 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
 #include "ppapi/c/pp_size.h"
-#include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "srpcgen/ppb_rpc.h"
 
 namespace ppapi_proxy {
@@ -15,16 +14,16 @@ namespace ppapi_proxy {
 namespace {
 
 void SampleGamepads(PP_Instance instance,
-                    struct PP_GamepadsSampleData_Dev* pads) {
+                    struct PP_GamepadsSampleData* pads) {
   DebugPrintf("PPB_Gamepad::SampleGamepads: instance=%"NACL_PRId32"\n",
               instance);
   if (pads == NULL)
     return;
 
   nacl_abi_size_t pads_bytes =
-      static_cast<nacl_abi_size_t>(sizeof(struct PP_GamepadsSampleData_Dev));
+      static_cast<nacl_abi_size_t>(sizeof(struct PP_GamepadsSampleData));
   NaClSrpcError srpc_result =
-      PpbGamepadRpcClient::PPB_Gamepad_SampleGamepads(
+      PpbGamepadRpcClient::PPB_Gamepad_Sample(
           GetMainSrpcChannel(),
           instance,
           &pads_bytes,
@@ -38,8 +37,8 @@ void SampleGamepads(PP_Instance instance,
 
 }  // namespace
 
-const PPB_Gamepad_Dev* PluginGamepad::GetInterface() {
-  static const PPB_Gamepad_Dev gamepad_interface = {
+const PPB_Gamepad* PluginGamepad::GetInterface() {
+  static const PPB_Gamepad gamepad_interface = {
     SampleGamepads
   };
   return &gamepad_interface;
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.h
index 9f12fb1..2085422 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.h
@@ -6,14 +6,14 @@
 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_GAMEPAD_H_
 
 #include "native_client/src/include/nacl_macros.h"
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
 
 namespace ppapi_proxy {
 
 // Implements the untrusted side of the PPB_Gamepad interface.
 class PluginGamepad {
  public:
-  static const PPB_Gamepad_Dev* GetInterface();
+  static const PPB_Gamepad* GetInterface();
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(PluginGamepad);
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_gamepad.srpc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_gamepad.srpc
index e00ac4b..19fdf53 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_gamepad.srpc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_gamepad.srpc
@@ -3,13 +3,13 @@
 # found in the LICENSE file.
 
 # RPC methods used to implement PPB_Gamepad interface.
-# See ppapi/c/dev/ppb_gamepad_dev.h for interface details.
+# See ppapi/c/ppb_gamepad.h for interface details.
 {
  'name': 'PpbGamepadRpc',
  'rpcs': [
-          {'name': 'PPB_Gamepad_SampleGamepads',
+          {'name': 'PPB_Gamepad_Sample',
            'inputs': [['instance', 'PP_Instance']],
-           'outputs': [['data', 'char[]']]            # PP_GamepadsData_Dev
+           'outputs': [['data', 'char[]']]            # PP_GamepadsSampleData
           },
          ]
 }
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
index 384ab5d..e138728 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
@@ -1196,7 +1196,7 @@ NaClSrpcError PpbFullscreenRpcClient::PPB_Fullscreen_GetScreenSize(
   return retval;
 }
 
-NaClSrpcError PpbGamepadRpcClient::PPB_Gamepad_SampleGamepads(
+NaClSrpcError PpbGamepadRpcClient::PPB_Gamepad_Sample(
     NaClSrpcChannel* channel,
     PP_Instance instance,
     nacl_abi_size_t* data_bytes, char* data)  {
@@ -1206,7 +1206,7 @@ NaClSrpcError PpbGamepadRpcClient::PPB_Gamepad_SampleGamepads(
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
-      "PPB_Gamepad_SampleGamepads:i:C",
+      "PPB_Gamepad_Sample:i:C",
       instance,
       data_bytes, data
   );
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
index c2f7a3c..c6d729c 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
@@ -963,13 +963,13 @@ static void PPB_Fullscreen_GetScreenSizeDispatcher(
   );
 }
 
-static void PPB_Gamepad_SampleGamepadsDispatcher(
+static void PPB_Gamepad_SampleDispatcher(
     NaClSrpcRpc* rpc,
     NaClSrpcArg** inputs,
     NaClSrpcArg** outputs,
     NaClSrpcClosure* done
 ) {
-  PpbGamepadRpcServer::PPB_Gamepad_SampleGamepads(
+  PpbGamepadRpcServer::PPB_Gamepad_Sample(
       rpc,
       done,
       inputs[0]->u.ival,
@@ -3094,7 +3094,7 @@ NaClSrpcHandlerDesc PpbRpcs::srpc_methods[] = {
   { "PPB_Font_PixelOffsetForCharacter:iCCi:i", PPB_Font_PixelOffsetForCharacterDispatcher },
   { "PPB_Fullscreen_SetFullscreen:ii:i", PPB_Fullscreen_SetFullscreenDispatcher },
   { "PPB_Fullscreen_GetScreenSize:i:Ci", PPB_Fullscreen_GetScreenSizeDispatcher },
-  { "PPB_Gamepad_SampleGamepads:i:C", PPB_Gamepad_SampleGamepadsDispatcher },
+  { "PPB_Gamepad_Sample:i:C", PPB_Gamepad_SampleDispatcher },
   { "PPB_Graphics2D_Create:iCi:i", PPB_Graphics2D_CreateDispatcher },
   { "PPB_Graphics2D_IsGraphics2D:i:i", PPB_Graphics2D_IsGraphics2DDispatcher },
   { "PPB_Graphics2D_Describe:i:Cii", PPB_Graphics2D_DescribeDispatcher },
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h b/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h
index b0ca6c4..67cd5be 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h
@@ -501,7 +501,7 @@ class PpbFullscreenRpcServer {
 
 class PpbGamepadRpcServer {
  public:
-  static void PPB_Gamepad_SampleGamepads(
+  static void PPB_Gamepad_Sample(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
       PP_Instance instance,
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h b/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h
index da203c7..d5bc6e4 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h
@@ -439,7 +439,7 @@ class PpbFullscreenRpcClient {
 
 class PpbGamepadRpcClient {
  public:
-  static NaClSrpcError PPB_Gamepad_SampleGamepads(
+  static NaClSrpcError PPB_Gamepad_Sample(
       NaClSrpcChannel* channel,
       PP_Instance instance,
       nacl_abi_size_t* data_bytes, char* data);
diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi
index 3aa4056..f0724be 100644
--- a/ppapi/ppapi_sources.gypi
+++ b/ppapi/ppapi_sources.gypi
@@ -29,6 +29,7 @@
       'c/ppb_file_ref.h',
       'c/ppb_file_system.h',
       'c/ppb_fullscreen.h',
+      'c/ppb_gamepad.h',
       'c/ppb_graphics_2d.h',
       'c/ppb_graphics_3d.h',
       'c/ppb_image_data.h',
@@ -64,7 +65,6 @@
       'c/dev/ppb_find_dev.h',
       'c/dev/ppb_font_dev.h',
       'c/dev/ppb_fullscreen_dev.h',
-      'c/dev/ppb_gamepad_dev.h',
       'c/dev/ppb_ime_input_event_dev.h',
       'c/dev/ppb_memory_dev.h',
       'c/dev/ppb_message_loop_dev.h',
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 8842783..01977cc 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -288,7 +288,7 @@ PP_Bool PPB_Instance_Proxy::FlashGetScreenSize(PP_Instance instance,
 }
 
 void PPB_Instance_Proxy::SampleGamepads(PP_Instance instance,
-                                        PP_GamepadsSampleData_Dev* data) {
+                                        PP_GamepadsSampleData* data) {
   NOTIMPLEMENTED();
 }
 
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index 60661f7..edb6a95 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -73,7 +73,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
   virtual PP_Bool FlashGetScreenSize(PP_Instance instance, PP_Size* size)
       OVERRIDE;
   virtual void SampleGamepads(PP_Instance instance,
-                              PP_GamepadsSampleData_Dev* data) OVERRIDE;
+                              PP_GamepadsSampleData* data) OVERRIDE;
   virtual int32_t RequestInputEvents(PP_Instance instance,
                                      uint32_t event_classes) OVERRIDE;
   virtual int32_t RequestFilteringInputEvents(PP_Instance instance,
diff --git a/ppapi/tests/all_c_includes.h b/ppapi/tests/all_c_includes.h
index 4aad72b..5ecc7ef 100644
--- a/ppapi/tests/all_c_includes.h
+++ b/ppapi/tests/all_c_includes.h
@@ -22,7 +22,6 @@
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
 #include "ppapi/c/dev/ppb_ime_input_event_dev.h"
 #include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 #include "ppapi/c/dev/ppb_memory_dev.h"
@@ -71,6 +70,7 @@
 #include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/ppb_file_system.h"
 #include "ppapi/c/ppb_fullscreen.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/c/ppb_graphics_3d.h"
 #include "ppapi/c/ppb_image_data.h"
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index 037dce8..7d81554 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -43,7 +43,6 @@ PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_DEV_INTERFACE_0_5,
               PPB_FileChooser_Dev_0_5)
 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_GAMEPAD_DEV_INTERFACE_0_2, PPB_Gamepad_Dev_0_2)
 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)
 PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE_0_1,
diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h
index d8a3f03..556a11f 100644
--- a/ppapi/thunk/interfaces_ppb_public_stable.h
+++ b/ppapi/thunk/interfaces_ppb_public_stable.h
@@ -54,6 +54,7 @@ PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_1, PPB_AudioConfig_1_1)
 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_Instance, PPB_GAMEPAD_INTERFACE_1_0, PPB_Gamepad_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)
diff --git a/ppapi/thunk/ppb_gamepad_thunk.cc b/ppapi/thunk/ppb_gamepad_thunk.cc
index 376faa4..fb68012 100644
--- a/ppapi/thunk/ppb_gamepad_thunk.cc
+++ b/ppapi/thunk/ppb_gamepad_thunk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_instance_api.h"
@@ -13,20 +13,20 @@ namespace thunk {
 
 namespace {
 
-void SampleGamepads(PP_Instance instance, PP_GamepadsSampleData_Dev* data) {
+void SampleGamepads(PP_Instance instance, PP_GamepadsSampleData* data) {
   EnterFunction<PPB_Instance_FunctionAPI> enter(instance, true);
   if (enter.failed())
     return;
   enter.functions()->SampleGamepads(instance, data);
 }
 
-const PPB_Gamepad_Dev g_ppb_gamepad_thunk = {
+const PPB_Gamepad g_ppb_gamepad_thunk = {
   &SampleGamepads,
 };
 
 }  // namespace
 
-const PPB_Gamepad_Dev* GetPPB_Gamepad_Dev_0_2_Thunk() {
+const PPB_Gamepad* GetPPB_Gamepad_1_0_Thunk() {
   return &g_ppb_gamepad_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_instance_api.h b/ppapi/thunk/ppb_instance_api.h
index 87ea79c..d7ea28a 100644
--- a/ppapi/thunk/ppb_instance_api.h
+++ b/ppapi/thunk/ppb_instance_api.h
@@ -6,10 +6,10 @@
 #define PPAPI_THUNK_INSTANCE_API_H_
 
 #include "ppapi/c/dev/ppb_console_dev.h"
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_audio_config.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_size.h"
@@ -83,7 +83,7 @@ class PPB_Instance_FunctionAPI {
 
   // Gamepad.
   virtual void SampleGamepads(PP_Instance instance,
-                              PP_GamepadsSampleData_Dev* data) = 0;
+                              PP_GamepadsSampleData* data) = 0;
 
   // InputEvent.
   virtual int32_t RequestInputEvents(PP_Instance instance,
diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc
index cfc74a9..0ea004e 100644
--- a/webkit/plugins/ppapi/event_conversion.cc
+++ b/webkit/plugins/ppapi/event_conversion.cc
@@ -524,10 +524,10 @@ PP_InputEvent_Class ClassifyInputEvent(WebInputEvent::Type type) {
 }
 
 void ConvertWebKitGamepadData(WebKit::WebGamepads& webkit_data,
-                              PP_GamepadsSampleData_Dev* output_data) {
+                              PP_GamepadsSampleData* output_data) {
   output_data->length = webkit_data.length;
   for (unsigned i = 0; i < webkit_data.length; ++i) {
-    PP_GamepadSampleData_Dev& output_pad = output_data->items[i];
+    PP_GamepadSampleData& output_pad = output_data->items[i];
     const WebKit::WebGamepad& webkit_pad = webkit_data.items[i];
     output_pad.connected = webkit_pad.connected ? PP_TRUE : PP_FALSE;
     if (webkit_pad.connected) {
diff --git a/webkit/plugins/ppapi/event_conversion.h b/webkit/plugins/ppapi/event_conversion.h
index 573e5b6..deb5b9aa 100644
--- a/webkit/plugins/ppapi/event_conversion.h
+++ b/webkit/plugins/ppapi/event_conversion.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
@@ -50,9 +50,9 @@ std::vector<linked_ptr<WebKit::WebInputEvent> > CreateSimulatedWebInputEvents(
 PP_InputEvent_Class ClassifyInputEvent(WebKit::WebInputEvent::Type type);
 
 // Translate from WebGamepads to the Gamepad API format
-// PP_GamepadsSampleData_Dev.
+// PP_GamepadsSampleData.
 void ConvertWebKitGamepadData(WebKit::WebGamepads& webkit_data,
-                              PP_GamepadsSampleData_Dev* output_data);
+                              PP_GamepadsSampleData* output_data);
 
 }  // namespace ppapi
 }  // namespace webkit
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 318579c..40d0f77 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -13,7 +13,6 @@
 #include "base/utf_offset_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/dev/ppb_find_dev.h"
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
 #include "ppapi/c/dev/ppb_zoom_dev.h"
 #include "ppapi/c/dev/ppp_find_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
@@ -21,6 +20,7 @@
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_core.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
@@ -1345,7 +1345,7 @@ bool PluginInstance::IsRectTopmost(const gfx::Rect& rect) {
 }
 
 void PluginInstance::SampleGamepads(PP_Instance instance,
-                                    PP_GamepadsSampleData_Dev* data) {
+                                    PP_GamepadsSampleData* data) {
   WebKit::WebGamepads webkit_data;
   delegate()->SampleGamepads(&webkit_data);
   ConvertWebKitGamepadData(webkit_data, data);
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 284d6a3..a916d03 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -16,7 +16,6 @@
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
-#include "ppapi/c/dev/ppb_gamepad_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"
@@ -27,6 +26,7 @@
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_input_event.h"
+#include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppp_graphics_3d.h"
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/c/ppp_messaging.h"
@@ -295,7 +295,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   bool IsRectTopmost(const gfx::Rect& rect);
 
   // Implementation of PPB_Gamepad.
-  void SampleGamepads(PP_Instance instance, PP_GamepadsSampleData_Dev* data)
+  void SampleGamepads(PP_Instance instance, PP_GamepadsSampleData* data)
       OVERRIDE;
 
   // Implementation of PPP_Messaging.