Move gles2 extensions out of dev.

BUG=none
TEST=simple usage test in nacl
Review URL: https://chromiumcodereview.appspot.com/10354004

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

13 files changed, 175 insertions, 167 deletions

diff --git a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
index e07e870..7bdbaf2 100644
--- a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
+++ b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
@@ -13,8 +13,14 @@
 #define PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE \
     PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1
 
-// This interface is deprecated. Please use
-// PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 instead.
+// PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE is deprecated. Please use
+// PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE instead.
+
+#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 \
+    "PPB_OpenGLES2ChromiumMapSub(Dev);1.0"
+
+// PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 is also deprecated.  Please
+// use PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE instead.
 
 struct PPB_GLESChromiumTextureMapping_Dev_0_1 {
   // Maps the sub-image of a texture. 'level', 'xoffset', 'yoffset', 'width',
diff --git a/ppapi/c/dev/ppb_opengles2ext_dev.h b/ppapi/c/dev/ppb_opengles2ext_dev.h
index 8c7eee3..9696c63 100644
--- a/ppapi/c/dev/ppb_opengles2ext_dev.h
+++ b/ppapi/c/dev/ppb_opengles2ext_dev.h
@@ -13,76 +13,5 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppb_opengles2.h"
 
-#define PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0 "PPB_OpenGLES2InstancedArrays(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2InstancedArrays_Dev {
-  void (*DrawArraysInstancedANGLE)(
-      PP_Resource context, GLenum mode, GLint first, GLsizei count,
-      GLsizei primcount);
-  void (*DrawElementsInstancedANGLE)(
-      PP_Resource context, GLenum mode, GLsizei count, GLenum type,
-      const void* indices, GLsizei primcount);
-  void (*VertexAttribDivisorANGLE)(
-      PP_Resource context, GLuint index, GLuint divisor);
-};
-
-#define PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0 "PPB_OpenGLES2FramebufferBlit(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2FramebufferBlit_Dev {
-  void (*BlitFramebufferEXT)(
-      PP_Resource context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-      GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
-      GLenum filter);
-};
-
-#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0 "PPB_OpenGLES2FramebufferMultisample(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2FramebufferMultisample_Dev {
-  void (*RenderbufferStorageMultisampleEXT)(
-      PP_Resource context, GLenum target, GLsizei samples,
-      GLenum internalformat, GLsizei width, GLsizei height);
-};
-
-#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0 "PPB_OpenGLES2ChromiumEnableFeature(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2ChromiumEnableFeature_Dev {
-  GLboolean (*EnableFeatureCHROMIUM)(PP_Resource context, const char* feature);
-};
-
-#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 "PPB_OpenGLES2ChromiumMapSub(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2ChromiumMapSub_Dev {
-  void* (*MapBufferSubDataCHROMIUM)(
-      PP_Resource context, GLuint target, GLintptr offset, GLsizeiptr size,
-      GLenum access);
-  void (*UnmapBufferSubDataCHROMIUM)(PP_Resource context, const void* mem);
-  void* (*MapTexSubImage2DCHROMIUM)(
-      PP_Resource context, GLenum target, GLint level, GLint xoffset,
-      GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type,
-      GLenum access);
-  void (*UnmapTexSubImage2DCHROMIUM)(PP_Resource context, const void* mem);
-};
-
-#define PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0 "PPB_OpenGLES2Query(Dev);1.0"
-#define PPB_OPENGLES2_QUERY_DEV_INTERFACE PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0
-
-struct PPB_OpenGLES2Query_Dev {
-  void (*GenQueriesEXT)(PP_Resource context, GLsizei n, GLuint* queries);
-  void (*DeleteQueriesEXT)(
-      PP_Resource context, GLsizei n, const GLuint* queries);
-  GLboolean (*IsQueryEXT)(PP_Resource context, GLuint id);
-  void (*BeginQueryEXT)(PP_Resource context, GLenum target, GLuint id);
-  void (*EndQueryEXT)(PP_Resource context, GLenum target);
-  void (*GetQueryivEXT)(
-      PP_Resource context, GLenum target, GLenum pname, GLint* params);
-  void (*GetQueryObjectuivEXT)(
-      PP_Resource context, GLuint id, GLenum pname, GLuint* params);
-};
-
 #endif  // C_DEV_PPB_OPENGLES2EXT_DEV_H_
 
diff --git a/ppapi/c/ppb_opengles2.h b/ppapi/c/ppb_opengles2.h
index 8d7367b..fbfe846 100644
--- a/ppapi/c/ppb_opengles2.h
+++ b/ppapi/c/ppb_opengles2.h
@@ -302,5 +302,76 @@ struct PPB_OpenGLES2 {
       PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height);
 };
 
+#define PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0 "PPB_OpenGLES2InstancedArrays;1.0"  // NOLINT
+#define PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2InstancedArrays {
+  void (*DrawArraysInstancedANGLE)(
+      PP_Resource context, GLenum mode, GLint first, GLsizei count,
+      GLsizei primcount);
+  void (*DrawElementsInstancedANGLE)(
+      PP_Resource context, GLenum mode, GLsizei count, GLenum type,
+      const void* indices, GLsizei primcount);
+  void (*VertexAttribDivisorANGLE)(
+      PP_Resource context, GLuint index, GLuint divisor);
+};
+
+#define PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE_1_0 "PPB_OpenGLES2FramebufferBlit;1.0"  // NOLINT
+#define PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2FramebufferBlit {
+  void (*BlitFramebufferEXT)(
+      PP_Resource context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+      GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
+      GLenum filter);
+};
+
+#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE_1_0 "PPB_OpenGLES2FramebufferMultisample;1.0"  // NOLINT
+#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2FramebufferMultisample {
+  void (*RenderbufferStorageMultisampleEXT)(
+      PP_Resource context, GLenum target, GLsizei samples,
+      GLenum internalformat, GLsizei width, GLsizei height);
+};
+
+#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0 "PPB_OpenGLES2ChromiumEnableFeature;1.0"  // NOLINT
+#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2ChromiumEnableFeature {
+  GLboolean (*EnableFeatureCHROMIUM)(PP_Resource context, const char* feature);
+};
+
+#define PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0 "PPB_OpenGLES2ChromiumMapSub;1.0"  // NOLINT
+#define PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2ChromiumMapSub {
+  void* (*MapBufferSubDataCHROMIUM)(
+      PP_Resource context, GLuint target, GLintptr offset, GLsizeiptr size,
+      GLenum access);
+  void (*UnmapBufferSubDataCHROMIUM)(PP_Resource context, const void* mem);
+  void* (*MapTexSubImage2DCHROMIUM)(
+      PP_Resource context, GLenum target, GLint level, GLint xoffset,
+      GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type,
+      GLenum access);
+  void (*UnmapTexSubImage2DCHROMIUM)(PP_Resource context, const void* mem);
+};
+
+#define PPB_OPENGLES2_QUERY_INTERFACE_1_0 "PPB_OpenGLES2Query;1.0"
+#define PPB_OPENGLES2_QUERY_INTERFACE PPB_OPENGLES2_QUERY_INTERFACE_1_0
+
+struct PPB_OpenGLES2Query {
+  void (*GenQueriesEXT)(PP_Resource context, GLsizei n, GLuint* queries);
+  void (*DeleteQueriesEXT)(
+      PP_Resource context, GLsizei n, const GLuint* queries);
+  GLboolean (*IsQueryEXT)(PP_Resource context, GLuint id);
+  void (*BeginQueryEXT)(PP_Resource context, GLenum target, GLuint id);
+  void (*EndQueryEXT)(PP_Resource context, GLenum target);
+  void (*GetQueryivEXT)(
+      PP_Resource context, GLenum target, GLenum pname, GLint* params);
+  void (*GetQueryObjectuivEXT)(
+      PP_Resource context, GLuint id, GLenum pname, GLuint* params);
+};
+
 #endif  // PPAPI_C_PPB_OPENGLES2_H_
 
diff --git a/ppapi/lib/gl/gles2/gl2ext_ppapi.c b/ppapi/lib/gl/gles2/gl2ext_ppapi.c
index b995fc6..bbd00ac 100644
--- a/ppapi/lib/gl/gles2/gl2ext_ppapi.c
+++ b/ppapi/lib/gl/gles2/gl2ext_ppapi.c
@@ -26,17 +26,17 @@
 // TODO(alokp): This will need to be thread-safe if we build gles2 as a
 // shared library.
 static const struct PPB_OpenGLES2* g_gles2_interface = NULL;
-static const struct PPB_OpenGLES2InstancedArrays_Dev*
+static const struct PPB_OpenGLES2InstancedArrays*
     g_gles2_instanced_arrays_interface = NULL;
-static const struct PPB_OpenGLES2FramebufferBlit_Dev*
+static const struct PPB_OpenGLES2FramebufferBlit*
     g_gles2_framebuffer_blit_interface = NULL;
-static const struct PPB_OpenGLES2FramebufferMultisample_Dev*
+static const struct PPB_OpenGLES2FramebufferMultisample*
     g_gles2_framebuffer_multisample_interface = NULL;
-static const struct PPB_OpenGLES2ChromiumEnableFeature_Dev*
+static const struct PPB_OpenGLES2ChromiumEnableFeature*
     g_gles2_chromium_enable_feature_interface = NULL;
-static const struct PPB_OpenGLES2ChromiumMapSub_Dev*
+static const struct PPB_OpenGLES2ChromiumMapSub*
     g_gles2_chromium_map_sub_interface = NULL;
-static const struct PPB_OpenGLES2Query_Dev*
+static const struct PPB_OpenGLES2Query*
     g_gles2_query_interface = NULL;
 
 // TODO(alokp): Make sure PP_TLS works on all supported platforms.
@@ -49,29 +49,29 @@ GLboolean GL_APIENTRY glInitializePPAPI(
   }
   if (!g_gles2_instanced_arrays_interface) {
     g_gles2_instanced_arrays_interface =
-        get_browser_interface(PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE);
+        get_browser_interface(PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE);
   }
   if (!g_gles2_framebuffer_blit_interface) {
     g_gles2_framebuffer_blit_interface =
-        get_browser_interface(PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE);
+        get_browser_interface(PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE);
   }
   if (!g_gles2_framebuffer_multisample_interface) {
     g_gles2_framebuffer_multisample_interface =
         get_browser_interface(
-            PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE);
+            PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE);
   }
   if (!g_gles2_chromium_enable_feature_interface) {
     g_gles2_chromium_enable_feature_interface =
         get_browser_interface(
-            PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE);
+            PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE);
   }
   if (!g_gles2_chromium_map_sub_interface) {
     g_gles2_chromium_map_sub_interface =
-        get_browser_interface(PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE);
+        get_browser_interface(PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE);
   }
   if (!g_gles2_query_interface) {
     g_gles2_query_interface =
-        get_browser_interface(PPB_OPENGLES2_QUERY_DEV_INTERFACE);
+        get_browser_interface(PPB_OPENGLES2_QUERY_INTERFACE);
   }
   return g_gles2_interface ? GL_TRUE : GL_FALSE;
 }
@@ -93,32 +93,32 @@ const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI() {
   return g_gles2_interface;
 }
 
-const struct PPB_OpenGLES2InstancedArrays_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2InstancedArrays* GL_APIENTRY
     glGetInstancedArraysInterfacePPAPI() {
   return g_gles2_instanced_arrays_interface;
 }
 
-const struct PPB_OpenGLES2FramebufferBlit_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2FramebufferBlit* GL_APIENTRY
     glGetFramebufferBlitInterfacePPAPI() {
   return g_gles2_framebuffer_blit_interface;
 }
 
-const struct PPB_OpenGLES2FramebufferMultisample_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2FramebufferMultisample* GL_APIENTRY
     glGetFramebufferMultisampleInterfacePPAPI() {
   return g_gles2_framebuffer_multisample_interface;
 }
 
-const struct PPB_OpenGLES2ChromiumEnableFeature_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2ChromiumEnableFeature* GL_APIENTRY
     glGetChromiumEnableFeatureInterfacePPAPI() {
   return g_gles2_chromium_enable_feature_interface;
 }
 
-const struct PPB_OpenGLES2ChromiumMapSub_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2ChromiumMapSub* GL_APIENTRY
     glGetChromiumMapSubInterfacePPAPI() {
   return g_gles2_chromium_map_sub_interface;
 }
 
-const struct PPB_OpenGLES2Query_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2Query* GL_APIENTRY
     glGetQueryInterfacePPAPI() {
   return g_gles2_query_interface;
 }
diff --git a/ppapi/lib/gl/gles2/gl2ext_ppapi.h b/ppapi/lib/gl/gles2/gl2ext_ppapi.h
index 40feca0..9b99c7e 100644
--- a/ppapi/lib/gl/gles2/gl2ext_ppapi.h
+++ b/ppapi/lib/gl/gles2/gl2ext_ppapi.h
@@ -37,17 +37,17 @@ GL_APICALL PP_Resource GL_APIENTRY glGetCurrentContextPPAPI();
 
 // Returns OpenGL ES 2.0 interface.
 GL_APICALL const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2InstancedArrays_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2InstancedArrays* GL_APIENTRY
     glGetInstancedArraysInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2FramebufferBlit_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2FramebufferBlit* GL_APIENTRY
     glGetFramebufferBlitInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2FramebufferMultisample_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2FramebufferMultisample* GL_APIENTRY
     glGetFramebufferMultisampleInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2ChromiumEnableFeature_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2ChromiumEnableFeature* GL_APIENTRY
     glGetChromiumEnableFeatureInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2ChromiumMapSub_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2ChromiumMapSub* GL_APIENTRY
     glGetChromiumMapSubInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2Query_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2Query* GL_APIENTRY
     glGetQueryInterfacePPAPI();
 
 #ifdef __cplusplus
diff --git a/ppapi/lib/gl/gles2/gles2.c b/ppapi/lib/gl/gles2/gles2.c
index 884127c..261525b 100644
--- a/ppapi/lib/gl/gles2/gles2.c
+++ b/ppapi/lib/gl/gles2/gles2.c
@@ -757,7 +757,7 @@ void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height) {
 void GL_APIENTRY glBlitFramebufferEXT(
     GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0,
     GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) {
-  const struct PPB_OpenGLES2FramebufferBlit_Dev* ext =
+  const struct PPB_OpenGLES2FramebufferBlit* ext =
       glGetFramebufferBlitInterfacePPAPI();
   if (ext)
     ext->BlitFramebufferEXT(
@@ -768,7 +768,7 @@ void GL_APIENTRY glBlitFramebufferEXT(
 void GL_APIENTRY glRenderbufferStorageMultisampleEXT(
     GLenum target, GLsizei samples, GLenum internalformat, GLsizei width,
     GLsizei height) {
-  const struct PPB_OpenGLES2FramebufferMultisample_Dev* ext =
+  const struct PPB_OpenGLES2FramebufferMultisample* ext =
       glGetFramebufferMultisampleInterfacePPAPI();
   if (ext)
     ext->RenderbufferStorageMultisampleEXT(
@@ -777,51 +777,51 @@ void GL_APIENTRY glRenderbufferStorageMultisampleEXT(
 }
 
 void GL_APIENTRY glGenQueriesEXT(GLsizei n, GLuint* queries) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->GenQueriesEXT(glGetCurrentContextPPAPI(), n, queries);
 }
 
 void GL_APIENTRY glDeleteQueriesEXT(GLsizei n, const GLuint* queries) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->DeleteQueriesEXT(glGetCurrentContextPPAPI(), n, queries);
 }
 
 GLboolean GL_APIENTRY glIsQueryEXT(GLuint id) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     return ext->IsQueryEXT(glGetCurrentContextPPAPI(), id);
   return 0;
 }
 
 void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint id) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->BeginQueryEXT(glGetCurrentContextPPAPI(), target, id);
 }
 
 void GL_APIENTRY glEndQueryEXT(GLenum target) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->EndQueryEXT(glGetCurrentContextPPAPI(), target);
 }
 
 void GL_APIENTRY glGetQueryivEXT(GLenum target, GLenum pname, GLint* params) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->GetQueryivEXT(glGetCurrentContextPPAPI(), target, pname, params);
 }
 
 void GL_APIENTRY glGetQueryObjectuivEXT(
     GLuint id, GLenum pname, GLuint* params) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->GetQueryObjectuivEXT(glGetCurrentContextPPAPI(), id, pname, params);
 }
 
 GLboolean GL_APIENTRY glEnableFeatureCHROMIUM(const char* feature) {
-  const struct PPB_OpenGLES2ChromiumEnableFeature_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumEnableFeature* ext =
       glGetChromiumEnableFeatureInterfacePPAPI();
   if (ext)
     return ext->EnableFeatureCHROMIUM(glGetCurrentContextPPAPI(), feature);
@@ -830,7 +830,7 @@ GLboolean GL_APIENTRY glEnableFeatureCHROMIUM(const char* feature) {
 
 void* GL_APIENTRY glMapBufferSubDataCHROMIUM(
     GLuint target, GLintptr offset, GLsizeiptr size, GLenum access) {
-  const struct PPB_OpenGLES2ChromiumMapSub_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumMapSub* ext =
       glGetChromiumMapSubInterfacePPAPI();
   if (ext)
     return ext->MapBufferSubDataCHROMIUM(
@@ -839,7 +839,7 @@ void* GL_APIENTRY glMapBufferSubDataCHROMIUM(
 }
 
 void GL_APIENTRY glUnmapBufferSubDataCHROMIUM(const void* mem) {
-  const struct PPB_OpenGLES2ChromiumMapSub_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumMapSub* ext =
       glGetChromiumMapSubInterfacePPAPI();
   if (ext)
     ext->UnmapBufferSubDataCHROMIUM(glGetCurrentContextPPAPI(), mem);
@@ -848,7 +848,7 @@ void GL_APIENTRY glUnmapBufferSubDataCHROMIUM(const void* mem) {
 void* GL_APIENTRY glMapTexSubImage2DCHROMIUM(
     GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
     GLsizei height, GLenum format, GLenum type, GLenum access) {
-  const struct PPB_OpenGLES2ChromiumMapSub_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumMapSub* ext =
       glGetChromiumMapSubInterfacePPAPI();
   if (ext)
     return ext->MapTexSubImage2DCHROMIUM(
@@ -858,7 +858,7 @@ void* GL_APIENTRY glMapTexSubImage2DCHROMIUM(
 }
 
 void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM(const void* mem) {
-  const struct PPB_OpenGLES2ChromiumMapSub_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumMapSub* ext =
       glGetChromiumMapSubInterfacePPAPI();
   if (ext)
     ext->UnmapTexSubImage2DCHROMIUM(glGetCurrentContextPPAPI(), mem);
@@ -866,7 +866,7 @@ void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM(const void* mem) {
 
 void GL_APIENTRY glDrawArraysInstancedANGLE(
     GLenum mode, GLint first, GLsizei count, GLsizei primcount) {
-  const struct PPB_OpenGLES2InstancedArrays_Dev* ext =
+  const struct PPB_OpenGLES2InstancedArrays* ext =
       glGetInstancedArraysInterfacePPAPI();
   if (ext)
     ext->DrawArraysInstancedANGLE(
@@ -876,7 +876,7 @@ void GL_APIENTRY glDrawArraysInstancedANGLE(
 void GL_APIENTRY glDrawElementsInstancedANGLE(
     GLenum mode, GLsizei count, GLenum type, const void* indices,
     GLsizei primcount) {
-  const struct PPB_OpenGLES2InstancedArrays_Dev* ext =
+  const struct PPB_OpenGLES2InstancedArrays* ext =
       glGetInstancedArraysInterfacePPAPI();
   if (ext)
     ext->DrawElementsInstancedANGLE(
@@ -884,7 +884,7 @@ void GL_APIENTRY glDrawElementsInstancedANGLE(
 }
 
 void GL_APIENTRY glVertexAttribDivisorANGLE(GLuint index, GLuint divisor) {
-  const struct PPB_OpenGLES2InstancedArrays_Dev* ext =
+  const struct PPB_OpenGLES2InstancedArrays* ext =
       glGetInstancedArraysInterfacePPAPI();
   if (ext)
     ext->VertexAttribDivisorANGLE(glGetCurrentContextPPAPI(), index, divisor);
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 af424ae..e50b2e6 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
@@ -206,12 +206,12 @@ const void* GetBrowserInterface(const char* interface_name) {
       PPB_GRAPHICS_3D_TRUSTED_INTERFACE,
       PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE,
       PPB_OPENGLES2_INTERFACE,
-      PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE,
-      PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE,
-      PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE,
-      PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE,
-      PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE,
-      PPB_OPENGLES2_QUERY_DEV_INTERFACE,
+      PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE,
+      PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE,
+      PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE,
+      PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE,
+      PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE,
+      PPB_OPENGLES2_QUERY_INTERFACE,
       PPB_LAYER_COMPOSITOR_DEV_INTERFACE
     };
     for (size_t i = 0; i < NACL_ARRAY_SIZE(disabled_interface_names); i++) {
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc
index 625282c..d1f41bd 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc
@@ -863,34 +863,34 @@ const PPB_OpenGLES2* PluginGraphics3D::GetOpenGLESInterface() {
   };
   return &ppb_opengles;
 }
-const PPB_OpenGLES2InstancedArrays_Dev* PluginGraphics3D::GetOpenGLESInstancedArraysInterface() {  // NOLINT
-  const static struct PPB_OpenGLES2InstancedArrays_Dev ppb_opengles = {
+const PPB_OpenGLES2InstancedArrays* PluginGraphics3D::GetOpenGLESInstancedArraysInterface() {  // NOLINT
+  const static struct PPB_OpenGLES2InstancedArrays ppb_opengles = {
     &DrawArraysInstancedANGLE,
     &DrawElementsInstancedANGLE,
     &VertexAttribDivisorANGLE
   };
   return &ppb_opengles;
 }
-const PPB_OpenGLES2FramebufferBlit_Dev* PluginGraphics3D::GetOpenGLESFramebufferBlitInterface() {  // NOLINT
-  const static struct PPB_OpenGLES2FramebufferBlit_Dev ppb_opengles = {
+const PPB_OpenGLES2FramebufferBlit* PluginGraphics3D::GetOpenGLESFramebufferBlitInterface() {  // NOLINT
+  const static struct PPB_OpenGLES2FramebufferBlit ppb_opengles = {
     &BlitFramebufferEXT
   };
   return &ppb_opengles;
 }
-const PPB_OpenGLES2FramebufferMultisample_Dev* PluginGraphics3D::GetOpenGLESFramebufferMultisampleInterface() {  // NOLINT
-  const static struct PPB_OpenGLES2FramebufferMultisample_Dev ppb_opengles = {
+const PPB_OpenGLES2FramebufferMultisample* PluginGraphics3D::GetOpenGLESFramebufferMultisampleInterface() {  // NOLINT
+  const static struct PPB_OpenGLES2FramebufferMultisample ppb_opengles = {
     &RenderbufferStorageMultisampleEXT
   };
   return &ppb_opengles;
 }
-const PPB_OpenGLES2ChromiumEnableFeature_Dev* PluginGraphics3D::GetOpenGLESChromiumEnableFeatureInterface() {  // NOLINT
-  const static struct PPB_OpenGLES2ChromiumEnableFeature_Dev ppb_opengles = {
+const PPB_OpenGLES2ChromiumEnableFeature* PluginGraphics3D::GetOpenGLESChromiumEnableFeatureInterface() {  // NOLINT
+  const static struct PPB_OpenGLES2ChromiumEnableFeature ppb_opengles = {
     &EnableFeatureCHROMIUM
   };
   return &ppb_opengles;
 }
-const PPB_OpenGLES2ChromiumMapSub_Dev* PluginGraphics3D::GetOpenGLESChromiumMapSubInterface() {  // NOLINT
-  const static struct PPB_OpenGLES2ChromiumMapSub_Dev ppb_opengles = {
+const PPB_OpenGLES2ChromiumMapSub* PluginGraphics3D::GetOpenGLESChromiumMapSubInterface() {  // NOLINT
+  const static struct PPB_OpenGLES2ChromiumMapSub ppb_opengles = {
     &MapBufferSubDataCHROMIUM,
     &UnmapBufferSubDataCHROMIUM,
     &MapTexSubImage2DCHROMIUM,
@@ -898,8 +898,8 @@ const PPB_OpenGLES2ChromiumMapSub_Dev* PluginGraphics3D::GetOpenGLESChromiumMapS
   };
   return &ppb_opengles;
 }
-const PPB_OpenGLES2Query_Dev* PluginGraphics3D::GetOpenGLESQueryInterface() {
-  const static struct PPB_OpenGLES2Query_Dev ppb_opengles = {
+const PPB_OpenGLES2Query* PluginGraphics3D::GetOpenGLESQueryInterface() {
+  const static struct PPB_OpenGLES2Query ppb_opengles = {
     &GenQueriesEXT,
     &DeleteQueriesEXT,
     &IsQueryEXT,
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 90ef45e..ed3f6739 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc
@@ -98,22 +98,22 @@ InterfaceMapElement interface_map[] = {
     PluginNetAddressPrivate::GetInterface1_1(), true },
   { PPB_OPENGLES2_INTERFACE_1_0, PluginGraphics3D::GetOpenGLESInterface(),
     true },
-  { PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0,
+  { PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0,
     PluginGraphics3D::GetOpenGLESInstancedArraysInterface(),
     true },
-  { PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0,
+  { PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE_1_0,
     PluginGraphics3D::GetOpenGLESFramebufferBlitInterface(),
     true },
-  { PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0,
+  { PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE_1_0,
     PluginGraphics3D::GetOpenGLESFramebufferMultisampleInterface(),
     true },
-  { PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0,
+  { PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0,
     PluginGraphics3D::GetOpenGLESChromiumEnableFeatureInterface(),
     true },
-  { PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0,
+  { PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0,
     PluginGraphics3D::GetOpenGLESChromiumMapSubInterface(),
     true },
-  { PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0,
+  { PPB_OPENGLES2_QUERY_INTERFACE_1_0,
     PluginGraphics3D::GetOpenGLESQueryInterface(),
     true },
   { PPB_PDF_INTERFACE, PluginPDF::GetInterface(), true },
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h
index 2adec3a..7ce19cb 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h
@@ -33,17 +33,17 @@ class PluginGraphics3D : public PluginResource {
 
   static const PPB_Graphics3D* GetInterface();
   static const PPB_OpenGLES2* GetOpenGLESInterface();
-  static const PPB_OpenGLES2InstancedArrays_Dev*
+  static const PPB_OpenGLES2InstancedArrays*
       GetOpenGLESInstancedArraysInterface();
-  static const PPB_OpenGLES2FramebufferBlit_Dev*
+  static const PPB_OpenGLES2FramebufferBlit*
       GetOpenGLESFramebufferBlitInterface();
-  static const PPB_OpenGLES2FramebufferMultisample_Dev*
+  static const PPB_OpenGLES2FramebufferMultisample*
       GetOpenGLESFramebufferMultisampleInterface();
-  static const PPB_OpenGLES2ChromiumEnableFeature_Dev*
+  static const PPB_OpenGLES2ChromiumEnableFeature*
       GetOpenGLESChromiumEnableFeatureInterface();
-  static const PPB_OpenGLES2ChromiumMapSub_Dev*
+  static const PPB_OpenGLES2ChromiumMapSub*
       GetOpenGLESChromiumMapSubInterface();
-  static const PPB_OpenGLES2Query_Dev*
+  static const PPB_OpenGLES2Query*
       GetOpenGLESQueryInterface();
 
   virtual bool InitFromBrowserResource(PP_Resource graphics3d_id);
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 281c557..e46666c 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -193,17 +193,19 @@ InterfaceList::InterfaceList() {
 #if !defined(OS_NACL)
   AddPPB(PPB_OPENGLES2_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetInterface());
-  AddPPB(PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0, API_ID_NONE,
+  AddPPB(PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetInstancedArraysInterface());
-  AddPPB(PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0, API_ID_NONE,
+  AddPPB(PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetFramebufferBlitInterface());
-  AddPPB(PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0, API_ID_NONE,
+  AddPPB(PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetFramebufferMultisampleInterface());
-  AddPPB(PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0, API_ID_NONE,
+  AddPPB(PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface());
+  AddPPB(PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0, API_ID_NONE,
+         PPB_OpenGLES2_Shared::GetChromiumMapSubInterface());
   AddPPB(PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetChromiumMapSubInterface());
-  AddPPB(PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0, API_ID_NONE,
+  AddPPB(PPB_OPENGLES2_QUERY_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetQueryInterface());
 #endif
   AddPPB(PPB_VAR_ARRAY_BUFFER_INTERFACE_1_0, API_ID_NONE,
diff --git a/ppapi/shared_impl/ppb_opengles2_shared.cc b/ppapi/shared_impl/ppb_opengles2_shared.cc
index 52755cf..03db463 100644
--- a/ppapi/shared_impl/ppb_opengles2_shared.cc
+++ b/ppapi/shared_impl/ppb_opengles2_shared.cc
@@ -988,34 +988,34 @@ const PPB_OpenGLES2* PPB_OpenGLES2_Shared::GetInterface() {
   };
   return &ppb_opengles2;
 }
-const PPB_OpenGLES2InstancedArrays_Dev* PPB_OpenGLES2_Shared::GetInstancedArraysInterface() {  // NOLINT
-  static const struct PPB_OpenGLES2InstancedArrays_Dev ppb_opengles2 = {
+const PPB_OpenGLES2InstancedArrays* PPB_OpenGLES2_Shared::GetInstancedArraysInterface() {  // NOLINT
+  static const struct PPB_OpenGLES2InstancedArrays ppb_opengles2 = {
     &DrawArraysInstancedANGLE,
     &DrawElementsInstancedANGLE,
     &VertexAttribDivisorANGLE
   };
   return &ppb_opengles2;
 }
-const PPB_OpenGLES2FramebufferBlit_Dev* PPB_OpenGLES2_Shared::GetFramebufferBlitInterface() {  // NOLINT
-  static const struct PPB_OpenGLES2FramebufferBlit_Dev ppb_opengles2 = {
+const PPB_OpenGLES2FramebufferBlit* PPB_OpenGLES2_Shared::GetFramebufferBlitInterface() {  // NOLINT
+  static const struct PPB_OpenGLES2FramebufferBlit ppb_opengles2 = {
     &BlitFramebufferEXT
   };
   return &ppb_opengles2;
 }
-const PPB_OpenGLES2FramebufferMultisample_Dev* PPB_OpenGLES2_Shared::GetFramebufferMultisampleInterface() {  // NOLINT
-  static const struct PPB_OpenGLES2FramebufferMultisample_Dev ppb_opengles2 = {
+const PPB_OpenGLES2FramebufferMultisample* PPB_OpenGLES2_Shared::GetFramebufferMultisampleInterface() {  // NOLINT
+  static const struct PPB_OpenGLES2FramebufferMultisample ppb_opengles2 = {
     &RenderbufferStorageMultisampleEXT
   };
   return &ppb_opengles2;
 }
-const PPB_OpenGLES2ChromiumEnableFeature_Dev* PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface() {  // NOLINT
-  static const struct PPB_OpenGLES2ChromiumEnableFeature_Dev ppb_opengles2 = {
+const PPB_OpenGLES2ChromiumEnableFeature* PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface() {  // NOLINT
+  static const struct PPB_OpenGLES2ChromiumEnableFeature ppb_opengles2 = {
     &EnableFeatureCHROMIUM
   };
   return &ppb_opengles2;
 }
-const PPB_OpenGLES2ChromiumMapSub_Dev* PPB_OpenGLES2_Shared::GetChromiumMapSubInterface() {  // NOLINT
-  static const struct PPB_OpenGLES2ChromiumMapSub_Dev ppb_opengles2 = {
+const PPB_OpenGLES2ChromiumMapSub* PPB_OpenGLES2_Shared::GetChromiumMapSubInterface() {  // NOLINT
+  static const struct PPB_OpenGLES2ChromiumMapSub ppb_opengles2 = {
     &MapBufferSubDataCHROMIUM,
     &UnmapBufferSubDataCHROMIUM,
     &MapTexSubImage2DCHROMIUM,
@@ -1023,8 +1023,8 @@ const PPB_OpenGLES2ChromiumMapSub_Dev* PPB_OpenGLES2_Shared::GetChromiumMapSubIn
   };
   return &ppb_opengles2;
 }
-const PPB_OpenGLES2Query_Dev* PPB_OpenGLES2_Shared::GetQueryInterface() {
-  static const struct PPB_OpenGLES2Query_Dev ppb_opengles2 = {
+const PPB_OpenGLES2Query* PPB_OpenGLES2_Shared::GetQueryInterface() {
+  static const struct PPB_OpenGLES2Query ppb_opengles2 = {
     &GenQueriesEXT,
     &DeleteQueriesEXT,
     &IsQueryEXT,
diff --git a/ppapi/shared_impl/ppb_opengles2_shared.h b/ppapi/shared_impl/ppb_opengles2_shared.h
index 8f037b7..8e25dfa 100644
--- a/ppapi/shared_impl/ppb_opengles2_shared.h
+++ b/ppapi/shared_impl/ppb_opengles2_shared.h
@@ -14,14 +14,14 @@ namespace ppapi {
 class PPAPI_SHARED_EXPORT PPB_OpenGLES2_Shared {
  public:
   static const PPB_OpenGLES2* GetInterface();
-  static const PPB_OpenGLES2InstancedArrays_Dev* GetInstancedArraysInterface();
-  static const PPB_OpenGLES2FramebufferBlit_Dev* GetFramebufferBlitInterface();
-  static const PPB_OpenGLES2FramebufferMultisample_Dev*
+  static const PPB_OpenGLES2InstancedArrays* GetInstancedArraysInterface();
+  static const PPB_OpenGLES2FramebufferBlit* GetFramebufferBlitInterface();
+  static const PPB_OpenGLES2FramebufferMultisample*
       GetFramebufferMultisampleInterface();
-  static const PPB_OpenGLES2ChromiumEnableFeature_Dev*
+  static const PPB_OpenGLES2ChromiumEnableFeature*
       GetChromiumEnableFeatureInterface();
-  static const PPB_OpenGLES2ChromiumMapSub_Dev* GetChromiumMapSubInterface();
-  static const PPB_OpenGLES2Query_Dev* GetQueryInterface();
+  static const PPB_OpenGLES2ChromiumMapSub* GetChromiumMapSubInterface();
+  static const PPB_OpenGLES2Query* GetQueryInterface();
 };
 
 }  // namespace ppapi