Revert 35509 - linux: implement gpu plugin...

gpu/command_buffer/service/gles2_cmd_decoder.h

 // Copyright (c) 2009 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.
 
 // This file contains the GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 
 #include <build/build_config.h>
-#if defined(OS_WIN)
+#if defined(OS_LINUX)
+#include "gpu/command_buffer/service/x_utils.h"
+#elif defined(OS_WIN)
 #include <windows.h>
 #endif
 #include "gpu/command_buffer/service/common_decoder.h"
 
 namespace gpu {
-// Forward-declared instead of including x_utils.h, because including glx.h
-// causes havok.
-class XWindowWrapper;
-
 namespace gles2 {
 
 // This class implements the AsyncAPIInterface interface, decoding GLES2
 // commands and calling GL.
 class GLES2Decoder : public CommonDecoder {
  public:
   typedef parse_error::ParseError ParseError;
 
   // Creates a decoder.
   static GLES2Decoder* Create();
@@ skipping 50 matching lines @@
   HWND hwnd_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_