Unix ifdefs patch for ui/ and webkit/

ui/gfx/font_unittest.cc

 // 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.
 
 #include "ui/gfx/font.h"
 
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <pango/pango.h>
 #elif defined(OS_WIN)
 #include "ui/gfx/platform_font_win.h"
 #endif
 
 namespace {
 
 using gfx::Font;
 
 class FontTest : public testing::Test {
  public:
   // Fulfills the memory management contract as outlined by the comment at
   // gfx::Font::GetNativeFont().
   void FreeIfNecessary(gfx::NativeFont font) {
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
     pango_font_description_free(font);
 #endif
   }
 };
 
 #if defined(OS_WIN)
 class ScopedMinimumFontSizeCallback {
  public:
   explicit ScopedMinimumFontSizeCallback(int minimum_size) {
     minimum_size_ = minimum_size;
@@ skipping 91 matching lines @@
   ScopedMinimumFontSizeCallback minimum_size(5);
 
   Font derived_font = cf.DeriveFont(-2);
   LOGFONT font_info;
   GetObject(derived_font.GetNativeFont(), sizeof(LOGFONT), &font_info);
   EXPECT_EQ(-6, font_info.lfHeight);
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace