Remove kFontConfigTestingEnvironment

CL [1] propagates the FONTCONFIG_FILE environment variable to subprocesses and
thus ensures, child/utility processes receive the correct fontconfig testing
environment.  This means adding a command line switch to indicate a testing
environment for fontconfig is no longer necessary.

R=drott,thestig
BUG=849923

Change-Id: I2234802904e9f725fa0b221fd65aced4885e0023
Reviewed-on: https://chromium-review.googlesource.com/1112768
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570263}

base/test/fontconfig_util_linux.cc

@@ -15,12 +15,6 @@
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 
-namespace switches {
-// Indicate to child processes that they should set up the FontConfig testing
-// environment.
-const char kFontConfigTestingEnvironment[] = "fontconfig-testing-environment";
-};  // namespace switches
-
 namespace base {
 
 namespace {

base/test/fontconfig_util_linux.h

@@ -5,10 +5,6 @@
 #ifndef BASE_TEST_FONTCONFIG_UTIL_LINUX_H_
 #define BASE_TEST_FONTCONFIG_UTIL_LINUX_H_
 
-namespace switches {
-extern const char kFontConfigTestingEnvironment[];
-};
-
 namespace base {
 
 // Initializes Fontconfig with a custom configuration suitable for tests.

base/test/test_suite.cc

@@ -411,11 +411,6 @@ void TestSuite::Initialize() {
   switches.erase(switches::kEnableFeatures);
   switches.erase(switches::kDisableFeatures);
 
-#if defined(OS_LINUX)
-  // Pass to child processes that we need the FontConfig testing environment.
-  switches[switches::kFontConfigTestingEnvironment] = "";
-#endif
-
   for (const auto& iter : switches)
     new_command_line.AppendSwitchNative(iter.first, iter.second);
 

components/services/font/BUILD.gn

@@ -19,7 +19,6 @@ source_set("lib") {
 
   deps = [
     "//base",
-    "//base/test:fontconfig_util_linux",
     "//components/services/font/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
@@ -85,7 +84,6 @@ service_test("font_service_unittests") {
 
   deps = [
     "//base",
-    "//base/test:fontconfig_util_linux",
     "//components/services/font/public/cpp",
     "//components/services/font/public/interfaces",
     "//mojo/public/cpp/bindings",

components/services/font/font_loader_test.cc

@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/run_loop.h"
-#include "base/test/fontconfig_util_linux.h"
 #include "components/services/font/public/interfaces/constants.mojom.h"
 #include "components/services/font/public/interfaces/font_service.mojom.h"
 #include "ppapi/buildflags/buildflags.h"

components/services/font/font_service_app.cc

@@ -9,7 +9,6 @@
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
-#include "base/test/fontconfig_util_linux.h"
 #include "build/build_config.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "ppapi/buildflags/buildflags.h"
@@ -49,11 +48,6 @@ base::File GetFileForPath(const base::FilePath& path) {
   return file;
 }
 
-bool FontConfigTestingEnvironmentEnabled() {
-  return base::CommandLine::ForCurrentProcess()->GetSwitches().count(
-      switches::kFontConfigTestingEnvironment);
-}
-
 int ConvertHinting(gfx::FontRenderParams::Hinting hinting) {
   switch (hinting) {
     case gfx::FontRenderParams::HINTING_NONE:
@@ -93,21 +87,11 @@ std::unique_ptr<service_manager::Service> FontServiceApp::CreateService() {
 }
 
 FontServiceApp::FontServiceApp() {
-  // TODO(thomasanderson) https://crbug.com/831146: Remove this once a reland of
-  // CL https://chromium-review.googlesource.com/c/chromium/src/+/1009071 lands,
-  // which propagates the FONTCONFIG_FILE environment variable to subprocesses
-  // and thus ensures, child/utility processes receive the correct fontconfig
-  // testing environment.
-  if (FontConfigTestingEnvironmentEnabled())
-    base::SetUpFontconfig();
   registry_.AddInterface(
       base::BindRepeating(&FontServiceApp::CreateSelf, base::Unretained(this)));
 }
 
-FontServiceApp::~FontServiceApp() {
-  if (FontConfigTestingEnvironmentEnabled())
-    base::TearDownFontconfig();
-}
+FontServiceApp::~FontServiceApp() {}
 
 void FontServiceApp::OnStart() {}