Run more HarfBuzzShaperTests

SafeToBreakMissingRun was a Mac only failure,
SafeToBreakArabicCommonLigatures were Mac and Android only failures,
ShapeArabicWithContext was waiting for range shaping to be implemented,
which had been fixed in the meantime for non-Mac..

Bug: 689155, 870712
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: I5ce017be3417ef24720cfb5a9818384ebd148b6c
Reviewed-on: https://chromium-review.googlesource.com/1162177
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582607}

third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc

@@ -414,9 +414,13 @@ TEST_F(HarfBuzzShaperTest, ShapeLatinSegment) {
 
 // Represents the case where a part of a cluster has a different color.
 // <div>0x647<span style="color: red;">0x64A</span></div>
-// This test requires context-aware shaping which hasn't been implemented yet.
-// See crbug.com/689155
-TEST_F(HarfBuzzShaperTest, DISABLED_ShapeArabicWithContext) {
+// TODO(crbug.com/689155): Still fails on Mac, AAT?
+#if defined(OS_MACOSX)
+#define MAYBE_ShapeArabicWithContext DISABLED_ShapeArabicWithContext
+#else
+#define MAYBE_ShapeArabicWithContext ShapeArabicWithContext
+#endif
+TEST_F(HarfBuzzShaperTest, MAYBE_ShapeArabicWithContext) {
   UChar arabic_string[] = {0x647, 0x64A};
   HarfBuzzShaper shaper(String(arabic_string, 2));
 
@@ -1446,8 +1450,15 @@ TEST_F(HarfBuzzShaperTest, SafeToBreakLatinDiscretionaryLigatures) {
             referenceResult->SnappedStartPositionForOffset(12));
 }
 
-// TODO(layout-dev): This test fails on Mac due to AAT shaping.
-TEST_F(HarfBuzzShaperTest, DISABLED_SafeToBreakArabicCommonLigatures) {
+// TODO(crbug.com/870712): This test fails on Mac due to AAT shaping and
+// font fallback differences on Android.
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#define MAYBE_SafeToBreakArabicCommonLigatures \
+  DISABLED_SafeToBreakArabicCommonLigatures
+#else
+#define MAYBE_SafeToBreakArabicCommonLigatures SafeToBreakArabicCommonLigatures
+#endif
+TEST_F(HarfBuzzShaperTest, MAYBE_SafeToBreakArabicCommonLigatures) {
   FontDescription::VariantLigatures ligatures;
   ligatures.common = FontDescription::kEnabledLigaturesState;
 
@@ -1479,7 +1490,12 @@ TEST_F(HarfBuzzShaperTest, DISABLED_SafeToBreakArabicCommonLigatures) {
 
 // Test when some characters are missing in |runs_|.
 // RTL on Mac may not have runs for all characters. crbug.com/774034
-TEST_P(ShapeParameterTest, DISABLED_SafeToBreakMissingRun) {
+#if defined(OS_MACOSX)
+#define MAYBE_SafeToBreakMissingRun DISABLED_SafeToBreakMissingRun
+#else
+#define MAYBE_SafeToBreakMissingRun SafeToBreakMissingRun
+#endif
+TEST_P(ShapeParameterTest, MAYBE_SafeToBreakMissingRun) {
   TextDirection direction = GetParam();
   scoped_refptr<ShapeResult> result = ShapeResult::Create(&font, 8, direction);
   result->InsertRunForTesting(2, 1, direction, {0});