Add a whitelist for specific msttcorefonts we still rely on

During the transition to using our own fonts, we want to make sure we don't
accidentally add new tests that rely on msttcorefonts we've already made efforts
to remove.  This CL adds a whitelist for the msttcorefonts we currently rely on.
The list should only shrink over time.

BUG=787020
R=thestig
CC=drott

Change-Id: I925600cd41f31a5a65941b48fc4456fb64a1f855
Reviewed-on: https://chromium-review.googlesource.com/965248
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543603}

base/test/fontconfig_util_linux.cc

@@ -34,6 +34,99 @@ const char kFontsConfTemplate[] = R"(<?xml version="1.0"?>
   <dir>/usr/share/fonts/opentype/ipafont-mincho</dir>
   <dir>/usr/share/fonts/truetype/msttcorefonts</dir>
 
+  <!-- The rejectfont element is used to exclude entire directories.  Then
+       acceptfont can be used to add specific fonts back.  Use this feature to
+       whitelist specific fonts from msttcorefonts while we transition to using
+       our own fonts. -->
+  <selectfont>
+    <rejectfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/*</glob>
+    </rejectfont>
+
+    <!-- Do not add more fonts to this list. -->
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Arial.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Arial_Bold_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Arial_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS_Bold.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Courier_New.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Courier_New_Bold.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Courier_New_Bold_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Courier_New_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Georgia_Bold.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Georgia_Bold_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Georgia_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Impact.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Bold.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Bold_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman_Bold.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman_Bold_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Verdana.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Verdana_Bold.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Verdana_Bold_Italic.ttf</glob>
+    </acceptfont>
+    <acceptfont>
+      <glob>/usr/share/fonts/truetype/msttcorefonts/Verdana_Italic.ttf</glob>
+    </acceptfont>
+  </selectfont>
+
   <!-- Default properties. -->
   <match target="font">
     <edit name="embeddedbitmap" mode="append_last">

third_party/WebKit/LayoutTests/platform/linux/fast/forms/text-control-intrinsic-widths-expected.txt

@@ -140,30 +140,30 @@ cols=1000 clientWidth=7017
 
 Andale Mono
 input
-size=1 clientWidth=8
-size=2 clientWidth=16
-size=3 clientWidth=24
-size=4 clientWidth=32
-size=5 clientWidth=40
+size=1 clientWidth=35
+size=2 clientWidth=40
+size=3 clientWidth=45
+size=4 clientWidth=50
+size=5 clientWidth=55
 size=10 clientWidth=80
-size=20 clientWidth=160
-size=50 clientWidth=400
-size=100 clientWidth=800
-size=500 clientWidth=4000
-size=1000 clientWidth=8000
+size=20 clientWidth=130
+size=50 clientWidth=280
+size=100 clientWidth=530
+size=500 clientWidth=2530
+size=1000 clientWidth=5030
 
 textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=33
-cols=3 clientWidth=41
-cols=4 clientWidth=49
-cols=5 clientWidth=57
-cols=10 clientWidth=97
-cols=20 clientWidth=177
-cols=50 clientWidth=417
-cols=100 clientWidth=817
-cols=500 clientWidth=4017
-cols=1000 clientWidth=8017
+cols=1 clientWidth=22
+cols=2 clientWidth=27
+cols=3 clientWidth=32
+cols=4 clientWidth=37
+cols=5 clientWidth=42
+cols=10 clientWidth=67
+cols=20 clientWidth=117
+cols=50 clientWidth=267
+cols=100 clientWidth=517
+cols=500 clientWidth=2517
+cols=1000 clientWidth=5017
 
 Arial
 input
@@ -356,30 +356,30 @@ cols=1000 clientWidth=7017
 
 Webdings
 input
-size=1 clientWidth=13
-size=2 clientWidth=26
-size=3 clientWidth=39
-size=4 clientWidth=52
-size=5 clientWidth=65
-size=10 clientWidth=130
-size=20 clientWidth=260
-size=50 clientWidth=650
-size=100 clientWidth=1300
-size=500 clientWidth=6500
-size=1000 clientWidth=13000
+size=1 clientWidth=35
+size=2 clientWidth=40
+size=3 clientWidth=45
+size=4 clientWidth=50
+size=5 clientWidth=55
+size=10 clientWidth=80
+size=20 clientWidth=130
+size=50 clientWidth=280
+size=100 clientWidth=530
+size=500 clientWidth=2530
+size=1000 clientWidth=5030
 
 textarea
-cols=1 clientWidth=30
-cols=2 clientWidth=43
-cols=3 clientWidth=56
-cols=4 clientWidth=69
-cols=5 clientWidth=82
-cols=10 clientWidth=147
-cols=20 clientWidth=277
-cols=50 clientWidth=667
-cols=100 clientWidth=1317
-cols=500 clientWidth=6517
-cols=1000 clientWidth=13017
+cols=1 clientWidth=22
+cols=2 clientWidth=27
+cols=3 clientWidth=32
+cols=4 clientWidth=37
+cols=5 clientWidth=42
+cols=10 clientWidth=67
+cols=20 clientWidth=117
+cols=50 clientWidth=267
+cols=100 clientWidth=517
+cols=500 clientWidth=2517
+cols=1000 clientWidth=5017
 
 PASS successfullyParsed is true