Revert of Reland of Different fonts selected for width calculation

LayoutTests/TestExpectations

Index: LayoutTests/TestExpectations
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index d93590e34d949cc28aff0acf1ce59a9c211adfe6..ffb8e4c18ca4e17da669c5305e931731df2051f7 100644
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -1337,6 +1337,7 @@ crbug.com/429133 [ SnowLeopard ] virtual/textblob/fast/text/bidi-embedding-pop-a
 crbug.com/429133 [ SnowLeopard ] virtual/textblob/fast/text/bidi-explicit-embedding-past-end.html [ Failure ]
 crbug.com/429133 [ SnowLeopard ] virtual/textblob/fast/text/cg-fallback-bolding.html [ Failure ]
 crbug.com/429133 [ SnowLeopard ] virtual/textblob/fast/text/decorations-transformed.html [ Failure ]
+crbug.com/429133 [ SnowLeopard ] virtual/textblob/fast/text/ellipsis-stroked.html [ ImageOnlyFailure ]
 crbug.com/429133 [ SnowLeopard ] virtual/textblob/fast/text/emphasis-avoid-ruby.html [ Failure ]
 crbug.com/429133 [ SnowLeopard ] virtual/textblob/fast/text/emphasis-overlap.html [ Failure ]
 crbug.com/429133 [ SnowLeopard ] virtual/textblob/fast/text/fake-italic.html [ Failure ]
@@ -1400,10 +1401,8 @@ crbug.com/431643 [ Win ] http/tests/w3c/webperf/submission/Intel/resource-timing
 
 crbug.com/435342 media/video-seeking.html [ Pass Failure ]
 
-crbug.com/436436 fast/dom/HTMLImageElement/image-srcset-w-onerror.html [ Pass Failure ]
+crbug.com/435525 [ Mac Debug ] svg/W3C-SVG-1.1/struct-frag-02-t.svg [ NeedsManualRebaseline ]
 
-# Test case needs to be updated after https://codereview.chromium.org/680213004/
-crbug.com/416425 virtual/textblob/fast/text/ellipsis-stroked.html [ ImageOnlyFailure ]
+crbug.com/436436 fast/dom/HTMLImageElement/image-srcset-w-onerror.html [ Pass Failure ]
 
 crbug.com/364225 virtual/gpu/fast/canvas/canvas-composite-text-alpha.html [ Pass Slow Timeout ]
-crbug.com/435525 [ Mac Debug ] svg/W3C-SVG-1.1/struct-frag-02-t.svg [ NeedsRebaseline ]