Revert of Add command_buffer_gles2

gpu/gles2_conform_support/egl/display.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_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
 
 #include <EGL/egl.h>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
 class GpuScheduler;
 class TransferBuffer;
 class TransferBufferManagerInterface;
 
 namespace gles2 {
 class GLES2CmdHelper;
 class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
 
-namespace base {
-class AtExitManager;
-}  // namespace base
-
 namespace egl {
 
 class Config;
 class Surface;
 
 class Display : private gpu::GpuControl {
  public:
   explicit Display(EGLNativeDisplayType display_id);
   ~Display() override;
 
@@ skipping 49 matching lines @@
   void SignalQuery(uint32 query, const base::Closure& callback) override;
   void SetSurfaceVisible(bool visible) override;
   uint32 CreateStreamTexture(uint32 texture_id) override;
   void SetLock(base::Lock*) override;
   bool IsGpuChannelLost() override;
 
  private:
   EGLNativeDisplayType display_id_;
 
   bool is_initialized_;
-
-// elg::Display is used for comformance tests and command_buffer_gles.  We can't
-// include the exit manager for the conformance tests.
-// TODO(hendrikw): Find a cleaner solution for this.
-#if !defined(GLES2_CONFORM_SUPPORT_ONLY)
-  scoped_ptr<base::AtExitManager> exit_manager_;
-#endif  // !GLES2_CONFORM_SUPPORT_ONLY
-
   bool create_offscreen_;
   int create_offscreen_width_;
   int create_offscreen_height_;
 
   scoped_refptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_;
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::GpuScheduler> gpu_scheduler_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_refptr<gfx::GLContext> gl_context_;
   scoped_refptr<gfx::GLSurface> gl_surface_;
   scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
   scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
 
   // TODO(alokp): Support more than one config, surface, and context.
   scoped_ptr<Config> config_;
   scoped_ptr<Surface> surface_;
   scoped_ptr<gpu::gles2::GLES2Implementation> context_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace egl
 
 #endif  // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_