6 files changed, 13 insertions, 20 deletions
diff --git a/webkit/extensions/v8/profiler_extension.cc b/webkit/extensions/v8/profiler_extension.cc
index 487649a..8683353 100644
--- a/webkit/extensions/v8/profiler_extension.cc
+++ b/webkit/extensions/v8/profiler_extension.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -13,7 +13,7 @@
 #include "base/third_party/purify/pure.h"
 #endif // QUANTIFY
 
-#if defined(USE_TCMALLOC) && defined(OS_LINUX)
+#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "third_party/tcmalloc/chromium/src/google/profiler.h"
 #endif
 
@@ -71,7 +71,7 @@ class ProfilerWrapper : public v8::Extension {
       const v8::Arguments& args) {
 #if defined(QUANTIFY)
     QuantifyStartRecordingData();
-#elif defined(USE_TCMALLOC) && defined(OS_LINUX)
+#elif defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
     ::ProfilerStart("chrome-profile");
 #endif
     return v8::Undefined();
@@ -81,7 +81,7 @@ class ProfilerWrapper : public v8::Extension {
       const v8::Arguments& args) {
 #if defined(QUANTIFY)
     QuantifyStopRecordingData();
-#elif defined(USE_TCMALLOC) && defined(OS_LINUX)
+#elif defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
     ::ProfilerStop();
 #endif
     return v8::Undefined();
@@ -97,7 +97,7 @@ class ProfilerWrapper : public v8::Extension {
 
   static v8::Handle<v8::Value> ProfilerFlush(
       const v8::Arguments& args) {
-#if defined(USE_TCMALLOC) && defined(OS_LINUX)
+#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
     ::ProfilerFlush();
 #endif
     return v8::Undefined();
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 31c6b13..7d44361 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -206,11 +206,7 @@ WebKitClientImpl::~WebKitClientImpl() {
 }
 
 WebThemeEngine* WebKitClientImpl::themeEngine() {
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   return &theme_engine_;
-#else
-  return NULL;
-#endif
 }
 
 WebURLLoader* WebKitClientImpl::createURLLoader() {
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 52a216b..fbf3daf 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -10,10 +10,10 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
 #if defined(OS_WIN)
 #include "webkit/glue/webthemeengine_impl_win.h"
-#elif defined(OS_LINUX)
-#include "webkit/glue/webthemeengine_impl_linux.h"
 #elif defined(OS_MACOSX)
 #include "webkit/glue/webthemeengine_impl_mac.h"
+#elif defined(OS_POSIX)
+#include "webkit/glue/webthemeengine_impl_linux.h"
 #endif
 
 
@@ -91,10 +91,7 @@ class WebKitClientImpl : public WebKit::WebKitClient {
   void (*shared_timer_func_)();
   double shared_timer_fire_time_;
   int shared_timer_suspended_;  // counter
-
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   WebThemeEngineImpl theme_engine_;
-#endif
 };
 
 }  // namespace webkit_glue
diff --git a/webkit/plugins/npapi/plugin_lib_unittest.cc b/webkit/plugins/npapi/plugin_lib_unittest.cc
index bce68a6..516c24b 100644
--- a/webkit/plugins/npapi/plugin_lib_unittest.cc
+++ b/webkit/plugins/npapi/plugin_lib_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -60,7 +60,7 @@ TEST(PluginLibLoading, UnloadAllPlugins) {
   PluginLib::UnloadAllPlugins();
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
 
 // Test parsing a simple description: Real Audio.
 TEST(MIMEDescriptionParse, Simple) {
@@ -174,7 +174,7 @@ TEST(PluginDescriptionParse, ExtractVersion) {
   EXPECT_EQ(ASCIIToUTF16("1.9.3"), info.version);
 }
 
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 }  // namespace npapi
 }  // namespace webkit
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h
index 45d04d0..c0348d3 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_impl.h
@@ -30,7 +30,7 @@ class PPB_Flash_Impl {
                             uint32_t glyph_count,
                             const uint16_t glyph_indices[],
                             const PP_Point glyph_advances[])
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
       ;
 #else
       { return PP_FALSE; }
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index 99c4aad..bb7bdfd 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -55,10 +55,10 @@
 #if defined(OS_WIN)
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebThemeEngine.h"
 #include "webkit/tools/test_shell/test_shell_webthemeengine.h"
-#elif defined(OS_LINUX)
-#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebThemeEngine.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
+#elif defined(OS_POSIX)
+#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebThemeEngine.h"
 #endif
 
 using WebKit::WebScriptController;