Revert "Reland "ozone: fix expectations in clipboard test""

This reverts commit 0d3b1f9c.

Reason for revert: This seems to make ClipboardTest/TestClipboardTest.ReadAvailablePlatformSpecificFormatNamesTest fail.
https://ci.chromium.org/p/chromium/builders/ci/linux-lacros-tester-rel/2950

Original change's description:
> Reland "ozone: fix expectations in clipboard test"
>
> This is a reland of a60f7247
>
> 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}
>
> Bug: 1134495
> Change-Id: I5849855e3fd037dc7eb34d0b94bbc08b6246b234
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454051
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
> Cr-Commit-Position: refs/heads/master@{#814742}

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

Change-Id: Icd2d1a2e10e177bcbe85b66dd446fa2e8ed689ee
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1134495
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460367Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815009}

ui/base/clipboard/clipboard_test_template.h

@@ -58,8 +58,8 @@
 #endif
 
 using base::ASCIIToUTF16;
-using base::UTF16ToUTF8;
 using base::UTF8ToUTF16;
+using base::UTF16ToUTF8;
 
 using testing::Contains;
 
@@ -808,22 +808,12 @@ TYPED_TEST(ClipboardTest, ReadAvailablePlatformSpecificFormatNamesTest) {
   EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("public.utf8-plain-text")));
   EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("NSStringPboardType")));
   EXPECT_EQ(raw_types.size(), static_cast<uint64_t>(2));
-#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) && !defined(OS_CHROMEOS)
+#elif defined(USE_X11)
   EXPECT_THAT(raw_types, Contains(ASCIIToUTF16(kMimeTypeText)));
   EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("TEXT")));
   EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("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));
-#endif  // USE_X11
 #elif defined(OS_WIN)
   EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("CF_UNICODETEXT")));
   EXPECT_THAT(raw_types, Contains(ASCIIToUTF16("CF_TEXT")));