Fix a possible mismatch in OS-specific code in WaitableEventWatcher.

Also, sort headers to the extent possible.

BUG=none


Review URL: http://codereview.chromium.org/8776008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112678 0039d316-1c4b-4281-b951-d872f2087c98

base/synchronization/waitable_event_watcher.h

@@ -6,6 +6,7 @@
 #define BASE_SYNCHRONIZATION_WAITABLE_EVENT_WATCHER_H_
 #pragma once
 
+#include "base/base_export.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ -16,8 +17,6 @@
 #include "base/synchronization/waitable_event.h"
 #endif
 
-#include "base/base_export.h"
-
 namespace base {
 
 class Flag;
@@ -62,7 +61,7 @@ class WaitableEvent;
 // -----------------------------------------------------------------------------
 
 class BASE_EXPORT WaitableEventWatcher
-#if defined(OS_POSIX)
+#if !defined(OS_WIN)
     : public MessageLoop::DestructionObserver
 #endif
 {