diff options
| author | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
|---|---|---|
| committer | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
| commit | 2ec8df5602bedf518d0119005690b101d5b598ef (patch) | |
| tree | 04b9d44fdc22ceab2d10a02108765729062241c4 /ui/base/clipboard/clipboard_unittest.cc | |
| parent | 88efcce0d60e09489d8a3761f4c8fd0d4b51c625 (diff) | |
| download | chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.zip chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.gz chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.bz2 | |
Made the OS_LINUX ifdefs in ui/ and webkit/ directories more cross-platform, so that these files can be used on multiple POSIX platforms.
Review URL: http://codereview.chromium.org/6990051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/clipboard/clipboard_unittest.cc')
| -rw-r--r-- | ui/base/clipboard/clipboard_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc index a486ed1..5707a7e 100644 --- a/ui/base/clipboard/clipboard_unittest.cc +++ b/ui/base/clipboard/clipboard_unittest.cc @@ -142,7 +142,7 @@ TEST_F(ClipboardTest, TrickyHTMLTest) { #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; @@ -239,11 +239,11 @@ TEST_F(ClipboardTest, URLTest) { 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) { |