Unix ifdefs patch for ui/ and webkit/

ui/base/clipboard/clipboard_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 "build/build_config.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 124 matching lines @@
                                           Clipboard::BUFFER_STANDARD));
   clipboard.ReadHTML(Clipboard::BUFFER_STANDARD, &markup_result, &url_result);
   EXPECT_TRUE(ClipboardContentsIsExpected(markup, markup_result));
 #if defined(OS_WIN)
   // TODO(playmobil): It's not clear that non windows clipboards need to support
   // this.
   EXPECT_EQ(url, url_result);
 #endif  // defined(OS_WIN)
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
 // Regression test for crbug.com/56298 (pasting empty HTML crashes Linux).
 TEST_F(ClipboardTest, EmptyHTMLTest) {
   Clipboard clipboard;
   // ScopedClipboardWriter doesn't let us write empty data to the clipboard.
   clipboard.clipboard_data_ = new Clipboard::TargetMap();
   // The 1 is so the compiler doesn't warn about allocating an empty array.
   char* empty = new char[1];
   clipboard.InsertMapping("text/html", empty, 0U);
   clipboard.SetGtkClipboard();
 
@@ skipping 76 matching lines @@
                                           Clipboard::BUFFER_STANDARD));
   string16 text_result;
   clipboard.ReadText(Clipboard::BUFFER_STANDARD, &text_result);
 
   EXPECT_EQ(text_result, url);
 
   std::string ascii_text;
   clipboard.ReadAsciiText(Clipboard::BUFFER_STANDARD, &ascii_text);
   EXPECT_EQ(UTF16ToUTF8(url), ascii_text);
 
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
   ascii_text.clear();
   clipboard.ReadAsciiText(Clipboard::BUFFER_SELECTION, &ascii_text);
   EXPECT_EQ(UTF16ToUTF8(url), ascii_text);
-#endif  // defined(OS_LINUX)
+#endif
 }
 
 TEST_F(ClipboardTest, SharedBitmapTest) {
   unsigned int fake_bitmap[] = {
     0x46155189, 0xF6A55C8D, 0x79845674, 0xFA57BD89,
     0x78FD46AE, 0x87C64F5A, 0x36EDC5AF, 0x4378F568,
     0x91E9F63A, 0xC31EA14F, 0x69AB32DF, 0x643A3FD1,
   };
   gfx::Size fake_bitmap_size(3, 4);
   uint32 bytes = sizeof(fake_bitmap);
@@ skipping 166 matching lines @@
     writer.WriteBookmark(UTF8ToUTF16("foo"), "bar");
     writer.WriteHyperlink(ASCIIToUTF16("foo"), "bar");
     writer.WriteWebSmartPaste();
     // Left out: WriteFile, WriteFiles, WriteBitmapFromPixels, WritePickledData.
   }
 
   // Passes if we don't crash.
 }
 
 }  // namespace ui