Add command_buffer_gles2

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 adf39490f734c00f2b4ba35112fbe3434d4c9b94..ee3a2a8418fd63bb813d9e91abc107652c64a9af 100644
--- a/gpu/gles2_conform_support/egl/display.h
+++ b/gpu/gles2_conform_support/egl/display.h
@@ -30,6 +30,10 @@ class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
 
+namespace base {
+class AtExitManager;
+}  // namespace base
+
 namespace egl {
 
 class Config;
@@ -99,6 +103,14 @@ class Display : private gpu::GpuControl {
   EGLNativeDisplayType display_id_;
 
   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_;