Revert "Add NotoSansCJK font to content_shell_fonts collection."

This reverts commit 81325ee9.

Reason for revert: Seems to have broken the Webkit Android build.

Example from: https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.webkit%2FWebKit_Android__Nexus4_%2F74342%2F%2B%2Frecipes%2Fsteps%2Fwebkit_tests%2F0%2Fstdout

BUG=812597

Original change's description:
> Add NotoSansCJK font to content_shell_fonts collection.
> 
> Currently the set of fonts used for layout tests on Android and Fuchsia
> doesn't include any Chinese, Japanese or Korean fonts, so they render tofu
> on the pixel tests that contain text in these languages. Adding NotoSansCJK
> so these tests can render properly.
> 
> Bug: 778467, 787020
> Change-Id: Id29b65525d5af0be96984db69e62d9d198b87fd4
> Reviewed-on: https://chromium-review.googlesource.com/910122
> Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Reviewed-by: Dominik Röttsches <drott@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#536920}

TBR=sky@chromium.org,dpranke@chromium.org,sergeyu@chromium.org,drott@chromium.org

Change-Id: I3894b1c956837796b1b0bb5fa4fc3e9e2e6eba8f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 778467, 787020
Reviewed-on: https://chromium-review.googlesource.com/921501Reviewed-by: Tim Schumann <tschumann@chromium.org>
Commit-Queue: Tim Schumann <tschumann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537002}

content/shell/test_runner/resources/fonts/android_fallback_fonts.xml

@@ -30,11 +30,6 @@
             <file>MuktiNarrow.ttf</file>
         </fileset>
     </family>
-    <family>
-        <fileset>
-            <file>NotoSansCJKkr-Regular.otf</file>
-        </fileset>
-    </family>
     <family>
         <fileset>
             <file>NotoSansKhmer-Regular.ttf</file>

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -109,7 +109,6 @@ FONT_FILES = [
     [[CONTENT_SHELL_FONTS_DIR], 'Lohit-Tamil.ttf', None],
     [[CONTENT_SHELL_FONTS_DIR], 'MuktiNarrow.ttf', None],
     [[CONTENT_SHELL_FONTS_DIR], 'NotoSansKhmer-Regular.ttf', None],
-    [[CONTENT_SHELL_FONTS_DIR], 'NotoSansCJKkr-Regular.otf', None],
 ]
 
 

third_party/content_shell_fonts/BUILD.gn

@@ -11,7 +11,6 @@ copy("content_shell_fonts") {
     "content_shell_test_fonts/Lohit-Gurmukhi.ttf",
     "content_shell_test_fonts/Lohit-Tamil.ttf",
     "content_shell_test_fonts/MuktiNarrow.ttf",
-    "content_shell_test_fonts/NotoSansCJKjp-Regular.otf",
     "content_shell_test_fonts/NotoSansKhmer-Regular.ttf",
   ]
 

third_party/content_shell_fonts/README.chromium

@@ -28,8 +28,7 @@ How to update or add fonts:
     by executing the following command:
      $ git add ./third_party/content_shell_fonts/content_shell_test_fonts.tar.gz.sha1
 7.  (optional) Modify loaded kSystemFontsForFontconfig and
-    kCloudStorageSyncedFonts lists in fontconfig_util_linux.cc . Also update
-    FONT_FILES in third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py .
+    kCloudStorageSyncedFonts lists in fontconfig_util_linux.cc
 
 If you need access to the chromium-fonts bucket, contact Chrome infra. For
 details, please refer to
@@ -43,5 +42,4 @@ Lohit-Devanagari.ttf       https://pagure.io/lohit
 Lohit-Gurmukhi.ttf         https://pagure.io/lohit
 Lohit-Tamil.ttf            https://pagure.io/lohit
 MuktiNarrow.ttf            http://www.nongnu.org/freebangfont/downloads.html#mukti
-NotoSansCJKjp-Regular.otf  https://www.google.com/get/noto/#sans-jpan
 NotoSansKhmer-Regular.ttf  https://www.google.com/get/noto/#sans-khmr

third_party/content_shell_fonts/content_shell_test_fonts.tar.gz.sha1

-eea1fc91877797451ff7cff29e49a3e15e1d9ee1
+df8105c58d91885e7cf812488a26cdcb6363f187
\ No newline at end of file

ui/gfx/test/fontconfig_util_linux.cc

@@ -56,14 +56,8 @@ const size_t kNumSystemFontsForFontconfig =
 
 const char* const kCloudStorageSyncedFonts[] = {
     // The DejaVuSans font is used by the css2.1 tests.
-    "DejaVuSans.ttf",
-    "Garuda.ttf",
-    "Lohit-Devanagari.ttf",
-    "Lohit-Tamil.ttf",
-    "Lohit-Gurmukhi.ttf",
-    "MuktiNarrow.ttf",
-    // TODO(sergeyu): Uncomment this and update test expectations.
-    // "NotoSansCJKjp-Regular.otf",
+    "DejaVuSans.ttf",           "Garuda.ttf",         "Lohit-Devanagari.ttf",
+    "Lohit-Tamil.ttf",          "Lohit-Gurmukhi.ttf", "MuktiNarrow.ttf",
     "NotoSansKhmer-Regular.ttf"};
 
 const size_t kNumCloudStorageSyncedFonts = arraysize(kCloudStorageSyncedFonts);