Revert "Add Unicode Variation Selector support to harfBuzzGetGlyph"

Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp

Index: Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp
diff --git a/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp b/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp
index 00ef055387769529377f4054eb7135dcd2c5e369..18ba9fb67a6eec54dedb121a96f3955fbc83c3b9 100644
--- a/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp
+++ b/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp
@@ -85,19 +85,8 @@ TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsUnicodeVariants)
         EXPECT_EQ(1u, shaper.numberOfRunsForTesting()) << test.name;
         ASSERT_TRUE(shaper.runInfoForTesting(0, startIndex, numGlyphs, script)) << test.name;
         EXPECT_EQ(0u, startIndex) << test.name;
-        if (numGlyphs == 2) {
-            // If the specified VS is not in the font, it's mapped to .notdef.
-            // then hb_ot_hide_default_ignorables() swaps it to a space with zero-advance.
-            // http://lists.freedesktop.org/archives/harfbuzz/2015-May/004888.html
-            // OpenType recommends Glyph ID 3 for a space; not a hard requirement though.
-            // https://www.microsoft.com/typography/otspec/recom.htm
-#if !OS(MACOSX)
-            EXPECT_EQ(3u, shaper.glyphForTesting(0, 1)) << test.name;
-#endif
-            EXPECT_EQ(0.f, shaper.advanceForTesting(0, 1)) << test.name;
-        } else {
-            EXPECT_EQ(1u, numGlyphs) << test.name;
-        }
+        // TODO(kojii): HarfBuzzFace does not support UVS yet and numGlyphs becomes 2
+        // EXPECT_EQ(1u, numGlyphs) << test.name;
         EXPECT_EQ(test.script, script) << test.name;
     }
 }