--- chrome/common/chrome_paths_internal.h
+++ chrome/common/chrome_paths_internal.h
@@ -19,7 +19,7 @@ bool GetDefaultUserDataDirectory(FilePath* result);
 // CF and Google Chrome want to share the same binaries.
 bool GetChromeFrameUserDataDirectory(FilePath* result);
 
-#if defined(OS_LINUX)
+#if defined(OS_NIX)
 // Get the path to the user's cache directory.
 bool GetUserCacheDirectory(FilePath* result);
 #endif
diff --git chrome/common/native_web_keyboard_event.h chrome/common/native_web_keyboard_event.h
index 4edf0e2..f70cdc9 100644