First batch of GCC fixes for GPU code.

gpu/command_buffer/service/x_utils.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 19 matching lines @@
  */
 
 
 // This file declares the XWindowWrapper class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_X_UTILS_H_
 #define GPU_COMMAND_BUFFER_SERVICE_X_UTILS_H_
 
 #include <GL/glx.h>
 #include "base/basictypes.h"
-#include "gpu/command_buffer/common/cross/logging.h"
+#include "gpu/command_buffer/common/logging.h"
 
 namespace command_buffer {
 
 // This class is a wrapper around an X Window and associated GL context. It is
 // useful to isolate intrusive X headers, since it can be forward declared
 // (Window and GLXContext can't).
 class XWindowWrapper {
  public:
   XWindowWrapper(Display *display, Window window)
       : display_(display),
@@ skipping 16 matching lines @@
  private:
   Display *display_;
   Window window_;
   GLXContext context_;
   DISALLOW_COPY_AND_ASSIGN(XWindowWrapper);
 };
 
 }  // namespace command_buffer
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_X_UTILS_H_