Make HarfBuzzShaperTest.ResolveCandidateRunsUnicodeVariants more robust

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/fonts/shaping/HarfBuzzShaper.h"
 
 #include "platform/fonts/Font.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/shaping/ShapeResultTestInfo.h"
 #include "platform/text/TextRun.h"
@@ skipping 71 matching lines @@
 
     EXPECT_EQ(1u, testInfo(result)->numberOfRunsForTesting()) << test.name;
     ASSERT_TRUE(
         testInfo(result)->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)
-// TODO(mgiuca): This expectation has been DISABLED due to failing on
-// Linux bots. See https://crbug.com/667147.
-// EXPECT_EQ(3u, testInfo(result)->glyphForTesting(0, 1)) << test.name;
+      EXPECT_EQ(testInfo(result)->fontDataForTesting(0)->spaceGlyph(),
+                testInfo(result)->glyphForTesting(0, 1))
+          << test.name;
 #endif
       EXPECT_EQ(0.f, testInfo(result)->advanceForTesting(0, 1)) << test.name;
     } else {
       EXPECT_EQ(1u, numGlyphs) << test.name;
     }
     EXPECT_EQ(test.script, script) << test.name;
   }
 }
 
 TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsDevanagariCommon) {
@@ skipping 96 matching lines @@
 
   ASSERT_EQ(1u, testInfo(result)->numberOfRunsForTesting());
   ASSERT_TRUE(
       testInfo(result)->runInfoForTesting(0, startIndex, numGlyphs, script));
   EXPECT_EQ(0u, startIndex);
   EXPECT_EQ(3u, numGlyphs);
   EXPECT_EQ(HB_SCRIPT_ARABIC, script);
 }
 
 }  // namespace blink