Add chromium_code: 1 to surface.gyp and gl.gyp to pick up -Werror.

ui/gfx/gl/gl_context_glx.cc

Index: ui/gfx/gl/gl_context_glx.cc
diff --git a/ui/gfx/gl/gl_context_glx.cc b/ui/gfx/gl/gl_context_glx.cc
index 1b1a35593d6ce4a6db0ee33d86514e5ba29f39a1..ba8d7ab8f7bab880db7ae403a2ae2ac7e790d2c4 100644
--- a/ui/gfx/gl/gl_context_glx.cc
+++ b/ui/gfx/gl/gl_context_glx.cc
@@ -33,13 +33,13 @@ bool IsCompositingWindowManagerActive(Display* display) {
   // The X macro "None" has been undefined by gl_bindings.h.
   const int kNone = 0;
   static Atom net_wm_cm_s0 = kNone;
-  if (net_wm_cm_s0 == kNone) {
+  if (net_wm_cm_s0 == static_cast<Atom>(kNone)) {
     net_wm_cm_s0 = XInternAtom(display, "_NET_WM_CM_S0", True);
   }
-  if (net_wm_cm_s0 == kNone) {
+  if (net_wm_cm_s0 == static_cast<Atom>(kNone)) {
     return false;
   }
-  return XGetSelectionOwner(display, net_wm_cm_s0) != kNone;
+  return XGetSelectionOwner(display, net_wm_cm_s0) != static_cast<Atom>(kNone);
 }
 
 }  // namespace anonymous
@@ -124,8 +124,6 @@ bool GLContextGLX::MakeCurrent(GLSurface* surface) {
   if (IsCurrent(surface))
     return true;
 
-  GLSurfaceGLX* surface_glx = static_cast<GLSurfaceGLX*>(surface);
-
   if (!glXMakeCurrent(
       GLSurfaceGLX::GetDisplay(),
       reinterpret_cast<GLXDrawable>(surface->GetHandle()),