reconstitute moving 3d out of dev CL. (previous attempt was reverted)

ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h

-/*
- * Copyright 2011 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
- */
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_GRAPHICS_3D_H_
 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_GRAPHICS_3D_H_
 
 #include "base/scoped_ptr.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_resource.h"
-#include "ppapi/c/dev/pp_graphics_3d_dev.h"
-#include "ppapi/c/dev/ppb_graphics_3d_dev.h"
-#include "ppapi/c/dev/ppb_opengles_dev.h"
+#include "ppapi/c/pp_graphics_3d.h"
+#include "ppapi/c/ppb_graphics_3d.h"
+#include "ppapi/c/ppb_opengles.h"
 #include "ppapi/c/pp_instance.h"
 
 namespace gpu {
 class CommandBuffer;
 namespace gles2 {
 class GLES2CmdHelper;
 class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
 
 namespace ppapi_proxy {
 
 // Implements the plugin (i.e., .nexe) side of the PPB_Graphics3D interface.
 class PluginGraphics3D : public PluginResource {
  public:
   PluginGraphics3D();
   virtual ~PluginGraphics3D();
 
-  static const PPB_Graphics3D_Dev* GetInterface();
-  static const PPB_OpenGLES2_Dev* GetOpenGLESInterface();
+  static const PPB_Graphics3D* GetInterface();
+  static const PPB_OpenGLES2* GetOpenGLESInterface();
 
   virtual bool InitFromBrowserResource(PP_Resource graphics3d_id);
 
   gpu::gles2::GLES2Implementation* impl() {
     return gles2_implementation_.get();
   }
 
   int32_t SwapBuffers(PP_Resource graphics3d_id,
                       struct PP_CompletionCallback callback);
 
@@ skipping 22 matching lines @@
   static gpu::gles2::GLES2Implementation* implFromResourceSlow(
       PP_Resource context);
 
   IMPLEMENT_RESOURCE(PluginGraphics3D);
   NACL_DISALLOW_COPY_AND_ASSIGN(PluginGraphics3D);
 };
 
 }  // namespace ppapi_proxy
 
 #endif  // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_GRAPHICS_3D_H_