Fix content shell layout test failure related to Fontconfig

ui/gfx/test/fontconfig_util_linux.cc

 // Copyright 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 "ui/gfx/test/fontconfig_util_linux.h"
 
 #include <fontconfig/fontconfig.h>
-

[msw, 2016/06/27 22:14:45]

nit: keep this blank line between include types?

 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 
 namespace gfx {
 
 const char* const kSystemFontsForFontconfig[] = {
   "/usr/share/fonts/truetype/kochi/kochi-gothic.ttf",
@@ skipping 38 matching lines @@
 const char kFontconfigFileHeader[] =
     "<?xml version=\"1.0\"?>\n"
     "<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">\n"
     "<fontconfig>\n";
 const char kFontconfigFileFooter[] = "</fontconfig>";
 const char kFontconfigMatchFontHeader[] = "  <match target=\"font\">\n";
 const char kFontconfigMatchPatternHeader[] = "  <match target=\"pattern\">\n";
 const char kFontconfigMatchFooter[] = "  </match>\n";
 
 void SetUpFontconfig() {
-  FcInit();
-
-  // A primer on undocumented FcConfig reference-counting:
-  //
-  // - FcConfigCreate() creates a config with a refcount of 1.
-  // - FcConfigReference() increments a config's refcount.
-  // - FcConfigDestroy() decrements a config's refcount, deallocating the
-  //   config when the count reaches 0.
-  // - FcConfigSetCurrent() calls FcConfigDestroy() on the old config, but
-  //   interestingly does not call FcConfigReference() on the new config.
-  CHECK(FcConfigSetCurrent(FcConfigCreate()));
+  CHECK(FcInit());
+  CHECK(FcConfigGetCurrent());
 }
 
 void TearDownFontconfig() {
   FcFini();
 }
 
 bool LoadFontIntoFontconfig(const base::FilePath& path) {
   if (!base::PathExists(path)) {
     LOG(ERROR) << "You are missing " << path.value() << ". Try re-running "
                << "build/install-build-deps.sh. Also see "
@@ skipping 71 matching lines @@
                                         const std::string& preferred_family) {
   return base::StringPrintf(
       "  <alias>\n"
       "    <family>%s</family>\n"
       "    <prefer><family>%s</family></prefer>\n"
       "  </alias>\n",
       original_family.c_str(), preferred_family.c_str());
 }
 
 }  // namespace gfx