4 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/child_process_launcher.cc b/chrome/browser/child_process_launcher.cc
index 206d8a7..60215d5 100644
--- a/chrome/browser/child_process_launcher.cc
+++ b/chrome/browser/child_process_launcher.cc
@@ -1,9 +1,11 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/child_process_launcher.h"
 
+#include <utility>  // For std::pair.
+
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ -66,7 +68,7 @@ class ChildProcessLauncher::Context
             &Context::LaunchInternal,
 #if defined(OS_WIN)
             exposed_dir,
-#elif defined(POSIX)
+#elif defined(OS_POSIX)
             use_zygote,
             environ,
             ipcfd,
diff --git a/chrome/browser/gpu_process_host.cc b/chrome/browser/gpu_process_host.cc
index 97f4f4a..f01b7d3 100644
--- a/chrome/browser/gpu_process_host.cc
+++ b/chrome/browser/gpu_process_host.cc
@@ -93,7 +93,7 @@ bool GpuProcessHost::Init() {
   Launch(
 #if defined(OS_WIN)
       FilePath(),
-#elif defined(POSIX)
+#elif defined(OS_POSIX)
       false,  // Never use the zygote (GPU plugin can't be sandboxed).
       base::environment_vector(),
 #endif
@@ -206,4 +206,3 @@ URLRequestContext* GpuProcessHost::GetRequestContext(
 bool GpuProcessHost::CanShutdown() {
   return true;
 }
-
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index a9b5c48..a182500 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -343,7 +343,7 @@ bool BrowserRenderProcessHost::Init(bool is_extensions_process,
     child_process_.reset(new ChildProcessLauncher(
 #if defined(OS_WIN)
         FilePath(),
-#elif defined(POSIX)
+#elif defined(OS_POSIX)
         renderer_prefix.empty(),
         base::environment_vector(),
         channel_->GetClientFileDescriptor(),
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 225df36..8a71b9d 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -221,7 +221,7 @@ void InProcessBrowserTest::TearDown() {
 
   browser_shutdown::delete_resources_on_shutdown = true;
 
-#if defined(WIN)
+#if defined(OS_WIN)
   BrowserView::SetShowState(-1);
 #endif