Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.

chrome/browser/browser_focus_uitest.cc

Index: chrome/browser/browser_focus_uitest.cc
===================================================================
--- chrome/browser/browser_focus_uitest.cc	(revision 69187)
+++ chrome/browser/browser_focus_uitest.cc	(working copy)
@@ -4,6 +4,11 @@
 
 #include "build/build_config.h"
 
+#if defined(OS_WIN)

[evanm, 2010/12/15 02:12:53]

I think Brett concluded we should put all these below the block of headers, like
how it was before.

[Lei Zhang, 2010/12/21 05:14:43]

Ok, reverted.

+#include <windows.h>
+#include <Psapi.h>
+#endif
+
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
@@ -42,11 +47,6 @@
 #include "chrome/browser/gtk/view_id_util.h"
 #endif
 
-#if defined(OS_WIN)
-#include <windows.h>
-#include <Psapi.h>
-#endif
-
 #if defined(OS_LINUX)
 #define MAYBE_FocusTraversal FocusTraversal
 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial
@@ -178,14 +178,14 @@
 
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) {
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
-#if defined(USE_X11) || defined(OS_MACOSX)
+#if defined(OS_POSIX)
   // It seems we have to wait a little bit for the widgets to spin up before
   // we can start clicking on them.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           new MessageLoop::QuitTask(),
                                           kActionDelayMs);
   ui_test_utils::RunMessageLoop();
-#endif
+#endif  // defined(OS_POSIX)
 
   ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR));