Commit cc563640 authored by Dominique Fauteux-Chapleau's avatar Dominique Fauteux-Chapleau Committed by Commit Bot

Revert "ozone: fix expectations in clipboard test"

This reverts commit a60f7247.

Reason for revert: Breaks Cast Audio Linux builder

Original change's description:
> ozone: fix expectations in clipboard test
>
> In case of Ozone, we support more types.
>
> Bug: 1134495
> Change-Id: I9712931545c8b70a1a0357d5b119b8c9a7c08c4e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443650
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
> Cr-Commit-Position: refs/heads/master@{#814303}

TBR=sky@chromium.org,msisov@igalia.com

Change-Id: I2d22d47498697b92e4fc486a90730b1268357bac
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1134495, 1135697
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453432Reviewed-by: default avatarDominique Fauteux-Chapleau <domfc@chromium.org>
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814348}
parent d14781f8
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
#endif #endif
using base::ASCIIToUTF16; using base::ASCIIToUTF16;
using base::UTF16ToUTF8;
using base::UTF8ToUTF16; using base::UTF8ToUTF16;
using base::UTF16ToUTF8;
using testing::Contains; using testing::Contains;
...@@ -808,22 +808,12 @@ TYPED_TEST(ClipboardTest, ReadAvailablePlatformSpecificFormatNamesTest) { ...@@ -808,22 +808,12 @@ TYPED_TEST(ClipboardTest, ReadAvailablePlatformSpecificFormatNamesTest) {
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("public.utf8-plain-text"))); EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("public.utf8-plain-text")));
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("NSStringPboardType"))); EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("NSStringPboardType")));
EXPECT_EQ(raw_types.size(), static_cast<uint64_t>(2)); EXPECT_EQ(raw_types.size(), static_cast<uint64_t>(2));
#elif defined(OS_LINUX) #elif defined(USE_X11)
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16(kMimeTypeText))); EXPECT_THAT(raw_types, Contains(ASCIIToUTF16(kMimeTypeText)));
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("TEXT"))); EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("TEXT")));
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("STRING"))); EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("STRING")));
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("UTF8_STRING"))); EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("UTF8_STRING")));
#if defined(USE_OZONE)
if (features::IsUsingOzonePlatform()) {
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16(kMimeTypeTextUtf8)));
EXPECT_EQ(raw_types.size(), static_cast<uint64_t>(5));
return;
}
#endif // USE_OZONE
#if defined(USE_X11)
EXPECT_FALSE(features::IsUsingOzonePlatform());
EXPECT_EQ(raw_types.size(), static_cast<uint64_t>(4)); EXPECT_EQ(raw_types.size(), static_cast<uint64_t>(4));
#endif // USE_X11
#elif defined(OS_WIN) #elif defined(OS_WIN)
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("CF_UNICODETEXT"))); EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("CF_UNICODETEXT")));
EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("CF_TEXT"))); EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("CF_TEXT")));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment