Revert 213996 "linux: Avoid leak in PlatformFontPangoTest.Family..."

More details @ http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/29992/steps/ui_unittests/logs/stdio

> linux: Avoid leak in PlatformFontPangoTest.FamilyList.
> 
> Call FcFini() at the end of the test to prevent FontConfig
> from leaking memory.
> 
> BUG=114750
> TBR=sky@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/19695014

TBR=derat@chromium.org

Review URL: https://codereview.chromium.org/20865002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214000 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 27 insertions, 18 deletions

diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 4ffe7c8..32789a9 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -782,29 +782,29 @@
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
-              '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
+              '<!@(<(pkg-config) --cflags pangocairo)',
             ],
           },
           'link_settings': {
             'ldflags': [
-              '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo)',
             ],
             'libraries': [
-              '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
+              '<!@(<(pkg-config) --libs-only-l pangocairo)',
             ],
           },
         }, {
           'direct_dependent_settings': {
             'cflags': [
-              '<!@(pkg-config --cflags pangocairo pangoft2)',
+              '<!@(pkg-config --cflags pangocairo)',
             ],
           },
           'link_settings': {
             'ldflags': [
-              '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)',
+              '<!@(pkg-config --libs-only-L --libs-only-other pangocairo)',
             ],
             'libraries': [
-              '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
+              '<!@(pkg-config --libs-only-l pangocairo)',
             ],
           },
         }],
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index e8f8649..9bcde79 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -414,6 +414,27 @@
    fun:*InitializeHelper
 }
 {
+   bug_114750_a
+   Heapcheck:Leak
+   fun:::FindBestMatchFontFamilyName
+   fun:gfx::PlatformFontPango::PlatformFontPango
+   fun:PlatformFontPangoTest_FamilyList_Test::TestBody
+}
+{
+   bug_114750_b
+   Heapcheck:Leak
+   fun:??
+   fun:FindBestMatchFontFamilyName
+   fun:PlatformFontPango
+   fun:gfx::PlatformFont::CreateFromNativeFont
+   fun:Font
+   fun:PlatformFontPango
+   fun:gfx::PlatformFont::CreateDefault
+   fun:Font
+   ...
+   fun:*Test*
+}
+{
    bug_114770
    Heapcheck:Leak
    ...
diff --git a/ui/gfx/platform_font_pango_unittest.cc b/ui/gfx/platform_font_pango_unittest.cc
index 58e9e6f..faa6c1c 100644
--- a/ui/gfx/platform_font_pango_unittest.cc
+++ b/ui/gfx/platform_font_pango_unittest.cc
@@ -4,11 +4,6 @@
 
 #include "ui/gfx/platform_font_pango.h"
 
-#include <cairo/cairo.h>
-#include <fontconfig/fontconfig.h>
-#include <pango/pangocairo.h>
-#include <pango/pangofc-fontmap.h>
-
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ -33,12 +28,6 @@ TEST(PlatformFontPangoTest, FamilyList) {
       new gfx::PlatformFontPango(desc2.get()));
   EXPECT_EQ("Times New Roman", font2->GetFontName());
   EXPECT_EQ(15, font2->GetFontSize());
-
-  // Free memory allocated by FontConfig (http://crbug.com/114750).
-  pango_fc_font_map_cache_clear(
-      PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()));
-  cairo_debug_reset_static_data();
-  FcFini();
 }
 
 }  // namespace gfx
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 100458f..09a7de8 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -254,7 +254,6 @@
         }],
         ['use_pango == 1', {
           'dependencies': [
-            '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:pangocairo',
           ],
           'sources': [