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

gpu/gles2_conform_support/egl/context.h

Index: gpu/gles2_conform_support/egl/context.h
diff --git a/gpu/gles2_conform_support/egl/context.h b/gpu/gles2_conform_support/egl/context.h
deleted file mode 100644
index e07aaac5171670f6fe496f40915fabc3263fb9e9..0000000000000000000000000000000000000000
--- a/gpu/gles2_conform_support/egl/context.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// 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 GPU_GLES2_CONFORM_TEST_CONTEXT_H_
-#define GPU_GLES2_CONFORM_TEST_CONTEXT_H_
-
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "gpu/command_buffer/client/gles2_cmd_helper.h"
-#include "gpu/command_buffer/client/gpu_control.h"
-#include "gpu/command_buffer/service/command_buffer_service.h"
-#include "gpu/command_buffer/service/command_executor.h"
-#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-#include "gpu/command_buffer/service/gpu_preferences.h"
-#include "ui/gfx/native_widget_types.h"
-#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_surface.h"
-#include "ui/gl/gl_surface.h"
-#include <EGL/egl.h>
-
-namespace gpu {
-class TransferBuffer;
-class TransferBufferManagerInterface;
-
-namespace gles2 {
-class GLES2CmdHelper;
-class GLES2Interface;
-}  // namespace gles2
-}  // namespace gpu
-
-namespace egl {
-class Display;
-class Surface;
-class Config;
-
-class Context : public base::RefCountedThreadSafe<Context>,
-                private gpu::GpuControl {
- public:
-  Context(Display* display, const Config* config);
-  bool is_current_in_some_thread() const { return is_current_in_some_thread_; }
-  void set_is_current_in_some_thread(bool flag) {
-    is_current_in_some_thread_ = flag;
-  }
-  void MarkDestroyed();
-  void FlushAndSwapBuffers(gfx::GLSurface* current_surface);
-
-  static bool MakeCurrent(Context* current_context,
-                          gfx::GLSurface* current_surface,
-                          Context* new_context,
-                          gfx::GLSurface* new_surface);
-
-  static bool ValidateAttributeList(const EGLint* attrib_list);
-
-  // GpuControl implementation.
-  void SetGpuControlClient(gpu::GpuControlClient*) override;
-  gpu::Capabilities GetCapabilities() override;
-  int32_t CreateImage(ClientBuffer buffer,
-                      size_t width,
-                      size_t height,
-                      unsigned internalformat) override;
-  void DestroyImage(int32_t id) override;
-  int32_t CreateGpuMemoryBufferImage(size_t width,
-                                     size_t height,
-                                     unsigned internalformat,
-                                     unsigned usage) override;
-  void SignalQuery(uint32_t query, const base::Closure& callback) override;
-  void SetLock(base::Lock*) override;
-  bool IsGpuChannelLost() override;
-  void EnsureWorkVisible() override;
-  gpu::CommandBufferNamespace GetNamespaceID() const override;
-  gpu::CommandBufferId GetCommandBufferID() const override;
-  int32_t GetExtraCommandBufferData() const override;
-  uint64_t GenerateFenceSyncRelease() override;
-  bool IsFenceSyncRelease(uint64_t release) override;
-  bool IsFenceSyncFlushed(uint64_t release) override;
-  bool IsFenceSyncFlushReceived(uint64_t release) override;
-  void SignalSyncToken(const gpu::SyncToken& sync_token,
-                       const base::Closure& callback) override;
-  bool CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) override;
-
-  // Called by ThreadState to set the needed global variables when this context
-  // is current.
-  void ApplyCurrentContext(gfx::GLSurface* current_surface);
-  static void ApplyContextReleased();
-
- private:
-  friend class base::RefCountedThreadSafe<Context>;
-  ~Context() override;
-  bool CreateService(gfx::GLSurface* gl_surface);
-  void DestroyService();
-  // Returns true if the object has GL service, either a working one or one
-  // that has lost its GL context.
-  bool HasService() const;
-  void MarkServiceContextLost();
-  bool WasServiceContextLost() const;
-  bool IsCompatibleSurface(gfx::GLSurface* gl_surface);
-  bool Flush(gfx::GLSurface* gl_surface);
-
-  Display* display_;
-  const Config* config_;
-  bool is_current_in_some_thread_;
-  bool is_destroyed_;
-  gpu::GpuPreferences gpu_preferences_;
-  scoped_ptr<gpu::CommandBufferService> command_buffer_;
-  scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
-  scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
-  scoped_ptr<gpu::CommandExecutor> command_executor_;
-  scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
-
-  scoped_refptr<gfx::GLContext> gl_context_;
-
-  scoped_ptr<gpu::gles2::GLES2Interface> client_gl_context_;
-  DISALLOW_COPY_AND_ASSIGN(Context);
-};
-
-}  // namespace egl
-
-#endif  // GPU_GLES2_CONFORM_TEST_CONTEXT_H_