linux: re-enable test plugin code for X events

webkit/tools/npapi_layout_test_plugin/main.cpp

Index: webkit/tools/npapi_layout_test_plugin/main.cpp
diff --git a/webkit/tools/npapi_layout_test_plugin/main.cpp b/webkit/tools/npapi_layout_test_plugin/main.cpp
index 16190db4797e8331ebad37f770d98174eada9e47..7b79b08ed65b330ba0b03fe539c864cea87863a1 100644
--- a/webkit/tools/npapi_layout_test_plugin/main.cpp
+++ b/webkit/tools/npapi_layout_test_plugin/main.cpp
@@ -34,13 +34,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <wtf/Platform.h>
-// The buildbot doesn't have Xlib.  Rather than revert this, I've just
-// temporarily ifdef'd it out.
-#ifdef XLIB_TEMPORARILY_DISABLED
-#if PLATFORM(UNIX)
-#include <X11/Xlib.h>
-#endif
-#endif
 #include "PluginObject.h"
 
 #ifdef WIN32
@@ -50,6 +43,10 @@
 #define NPAPI
 #endif
 
+#if defined(OS_LINUX)
+#include <X11/Xlib.h>
+#endif
+
 static void log(NPP instance, const char* format, ...)
 {
     va_list args;
@@ -335,8 +332,7 @@ int16 NPP_HandleEvent(NPP instance, void *event)
 
     fflush(stdout);
 
-#elif PLATFORM(UNIX)
-#ifdef XLIB_TEMPORARILY_DISABLED
+#elif defined(OS_LINUX)
     XEvent* evt = static_cast<XEvent*>(event);
     XButtonPressedEvent* bpress_evt = reinterpret_cast<XButtonPressedEvent*>(evt);
     XButtonReleasedEvent* brelease_evt = reinterpret_cast<XButtonReleasedEvent*>(evt);
@@ -375,8 +371,6 @@ int16 NPP_HandleEvent(NPP instance, void *event)
     }
 
     fflush(stdout);
-#endif  // XLIB_TEMPORARILY_DISABLED
-
 #else
     EventRecord* evt = static_cast<EventRecord*>(event);
     Point pt = { evt->where.v, evt->where.h };