Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Unified Diff: ui/base/clipboard/clipboard_unittest.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/base/l10n/l10n_util.cc » ('j') | ui/gfx/image_unittest_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_unittest.cc
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc
index a486ed18e9812dc0ab62050a6432a30e8f62c528..5707a7e6a7b4eba3a6c4393615d54f8e63e0f690 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) {
« no previous file with comments | « no previous file | ui/base/l10n/l10n_util.cc » ('j') | ui/gfx/image_unittest_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698