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

gpu/blink/webgraphicscontext3d_impl.h

 // 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.
 
 #ifndef GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
 #define GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 34 matching lines @@
 
   ::gpu::gles2::GLES2Interface* GetGLInterface() {
     return gl_;
   }
 
  protected:
   friend class WebGraphicsContext3DErrorMessageCallback;
 
   WebGraphicsContext3DImpl();
 
+  ::gpu::gles2::GLES2ImplementationErrorMessageCallback*
+      getErrorMessageCallback();
+  virtual void OnErrorMessage(const std::string& message, int id);
+
   void SetGLInterface(::gpu::gles2::GLES2Interface* gl) { gl_ = gl; }
 
   bool initialized_;
   bool initialize_failed_;
 
-  WebGraphicsContextLostCallback* context_lost_callback_;
-  WebGraphicsErrorMessageCallback* error_message_callback_;
+  WebGraphicsContext3D::WebGraphicsContextLostCallback* context_lost_callback_;
+
+  WebGraphicsContext3D::WebGraphicsErrorMessageCallback*
+      error_message_callback_;
+  scoped_ptr<WebGraphicsContext3DErrorMessageCallback>
+      client_error_message_callback_;
 
   ::gpu::gles2::GLES2Interface* gl_;
   bool lose_context_when_out_of_memory_;
 };
 
 }  // namespace gpu_blink
 
 #endif  // GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_