Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.

chrome/browser/process_singleton.h

Index: chrome/browser/process_singleton.h
===================================================================
--- chrome/browser/process_singleton.h	(revision 69187)
+++ chrome/browser/process_singleton.h	(working copy)
@@ -10,19 +10,21 @@
 
 #if defined(OS_WIN)
 #include <windows.h>
-#endif
+#endif  // defined(OS_WIN)
 
 #include "base/basictypes.h"
-#if defined(USE_X11) || defined(OS_MACOSX)
-#include "base/file_path.h"
-#endif
 #include "base/logging.h"
 #include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
 #include "gfx/native_widget_types.h"
+
+#if defined(OS_POSIX)
+#include "base/file_path.h"
+#endif  // defined(OS_POSIX)
+
 #if defined(USE_X11)
 #include "base/scoped_temp_dir.h"
-#endif
+#endif  // defined(USE_X11)
 
 class CommandLine;
 class FilePath;
@@ -65,7 +67,7 @@
   // instance.
   NotifyResult NotifyOtherProcessOrCreate();
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(USE_X11)

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

Is this really an X11-specific block of code?
Consider e.g. a future version of ChromeOS that doesn't use X.

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

Changed this to OS_LINUX since it's only implemented in
process_singleton_linux.cc.

   // Exposed for testing.  We use a timeout on Linux, and in tests we want
   // this timeout to be short.
   NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line,
@@ -74,7 +76,7 @@
   NotifyResult NotifyOtherProcessWithTimeoutOrCreate(
       const CommandLine& command_line,
       int timeout_seconds);
-#endif
+#endif  // defined(USE_X11)
 
   // Sets ourself up as the singleton instance.  Returns true on success.  If
   // false is returned, we are not the singleton instance and the caller must