Make lost context and error message callbacks on GpuControl go to client

gpu/blink/webgraphicscontext3d_impl.h

Index: gpu/blink/webgraphicscontext3d_impl.h
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
index 0dc5bc58bf3715c346dfbbdacc5aaff977e3537a..db2b82c1fd4ef00c739435a64fc3e6390229763c 100644
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -52,21 +52,15 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
 
   WebGraphicsContext3DImpl();
 
-  ::gpu::gles2::GLES2ImplementationErrorMessageCallback*
-      getErrorMessageCallback();
-  virtual void OnErrorMessage(const std::string& message, int id);
+  void OnErrorMessage(const char* message, int32_t id);
 
   void SetGLInterface(::gpu::gles2::GLES2Interface* gl) { gl_ = gl; }
 
   bool initialized_;
   bool initialize_failed_;
 
-  WebGraphicsContext3D::WebGraphicsContextLostCallback* context_lost_callback_;
-
-  WebGraphicsContext3D::WebGraphicsErrorMessageCallback*
-      error_message_callback_;
-  scoped_ptr<WebGraphicsContext3DErrorMessageCallback>
-      client_error_message_callback_;
+  WebGraphicsContextLostCallback* context_lost_callback_;
+  WebGraphicsErrorMessageCallback* error_message_callback_;
 
   ::gpu::gles2::GLES2Interface* gl_;
   bool lose_context_when_out_of_memory_;