command_buffer_gles2: Avoid creating multiple AtExitManagers

gpu/gles2_conform_support/egl/display.h

Index: gpu/gles2_conform_support/egl/display.h
diff --git a/gpu/gles2_conform_support/egl/display.h b/gpu/gles2_conform_support/egl/display.h
index acbf48f3e819cd07dc51d98853af52dfbc238b69..9e042a0c2c437b68726decb06f15ae28ac201397 100644
--- a/gpu/gles2_conform_support/egl/display.h
+++ b/gpu/gles2_conform_support/egl/display.h
@@ -33,10 +33,6 @@ class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
 
-namespace base {
-class AtExitManager;
-}  // namespace base
-
 namespace egl {
 
 class Config;
@@ -116,13 +112,6 @@ class Display : private gpu::GpuControl {
 
   bool is_initialized_;
 
-// elg::Display is used for comformance tests and command_buffer_gles.  We only
-// need the exit manager for the command_buffer_gles library.
-// TODO(hendrikw): Find a cleaner solution for this.
-#if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY)
-  scoped_ptr<base::AtExitManager> exit_manager_;
-#endif  // COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY
-
   bool create_offscreen_;
   int create_offscreen_width_;
   int create_offscreen_height_;