Revert of command_buffer_gles2: Implement EGL default Display as a global object

gpu/gles2_conform_support/egl/surface.h

Index: gpu/gles2_conform_support/egl/surface.h
diff --git a/gpu/gles2_conform_support/egl/surface.h b/gpu/gles2_conform_support/egl/surface.h
index 84ba0aac2d1ac2c79eab9b0d614be7205b786134..3db553efe566c17a753e4a6b4350f6112be3785b 100644
--- a/gpu/gles2_conform_support/egl/surface.h
+++ b/gpu/gles2_conform_support/egl/surface.h
@@ -8,28 +8,19 @@
 #include <EGL/egl.h>
 
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
-namespace gfx {
-class GLSurface;
-}
+
 namespace egl {
 
-class Surface : public base::RefCountedThreadSafe<Surface> {
+class Surface {
  public:
-  explicit Surface(gfx::GLSurface* gl_surface);
-  void set_is_current_in_some_thread(bool flag) {
-    is_current_in_some_thread_ = flag;
-  }
-  bool is_current_in_some_thread() const { return is_current_in_some_thread_; }
-  gfx::GLSurface* gl_surface() const;
-  static bool ValidatePbufferAttributeList(const EGLint* attrib_list);
-  static bool ValidateWindowAttributeList(const EGLint* attrib_list);
+  explicit Surface(EGLNativeWindowType win);
+  ~Surface();
+
+  EGLNativeWindowType window() { return window_; }
 
  private:
-  friend class base::RefCountedThreadSafe<Surface>;
-  ~Surface();
-  bool is_current_in_some_thread_;
-  scoped_refptr<gfx::GLSurface> gl_surface_;
+  EGLNativeWindowType window_;
+
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };