Change X11 error handler override to allow easy X11 error checking.

gpu/command_buffer/service/id_manager_unittest.cc

 // Copyright (c) 2010 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.
 
+// Include gtest.h out of order because <X11/X.h> #define's Bool & None, which
+// gtest uses as struct names (inside a namespace).  This means that
+// #include'ing gtest after anything that pulls in X.h fails to compile.
+// This is http://code.google.com/p/googletest/issues/detail?id=371
+#include "testing/gtest/include/gtest/gtest.h"
 #include "gpu/command_buffer/service/id_manager.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 namespace gles2 {
 
 class IdManagerTest : public testing::Test {
  public:
   IdManagerTest() {
   }
 
  protected:
@@ skipping 48 matching lines @@
   EXPECT_FALSE(manager_.RemoveMapping(kClientId1, kServiceId1));
   EXPECT_FALSE(manager_.RemoveMapping(kClientId2, kServiceId1));
   EXPECT_FALSE(manager_.RemoveMapping(kClientId1, kServiceId2));
   // Check we get an error if we try to map an existing id.
   EXPECT_FALSE(manager_.AddMapping(kClientId2, kServiceId2));
   EXPECT_FALSE(manager_.AddMapping(kClientId2, kServiceId1));
 }
 
 }  // namespace gles2
 }  // namespace gpu
-
-