Simplify PangoLayout configuration.

ui/gfx/platform_font_pango.cc

 // Copyright (c) 2012 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/platform_font_pango.h"
 
 #include <fontconfig/fontconfig.h>
 #include <pango/pango.h>
 
 #include <algorithm>
@@ skipping 55 matching lines @@
 
 #if defined(OS_CHROMEOS)
 // static
 std::string* PlatformFontPango::default_font_description_ = NULL;
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFontPango, public:
 
 PlatformFontPango::PlatformFontPango() {
-  if (default_font_ == NULL) {
-    std::string font_name = GetDefaultFont();
+  if (!default_font_) {
+    std::string desc_string;
+#if defined(OS_CHROMEOS)
+    // Font name must have been provided by way of SetDefaultFontDescription().
+    CHECK(default_font_description_);
+    desc_string = *default_font_description_;
+#else
+    const gfx::LinuxFontDelegate* delegate = gfx::LinuxFontDelegate::instance();
+    desc_string = delegate ? delegate->GetDefaultFontDescription() : "sans 10";
+#endif
 
     ScopedPangoFontDescription desc(
-        pango_font_description_from_string(font_name.c_str()));
+        pango_font_description_from_string(desc_string.c_str()));
     default_font_ = new Font(desc.get());
-
-    DCHECK(default_font_);
   }
 
   InitFromPlatformFont(
       static_cast<PlatformFontPango*>(default_font_->platform_font()));
 }
 
 PlatformFontPango::PlatformFontPango(NativeFont native_font) {
   std::vector<std::string> family_names;
   base::SplitString(pango_font_description_get_family(native_font), ',',
                     &family_names);
@@ skipping 147 matching lines @@
 
 PlatformFontPango::PlatformFontPango(const skia::RefPtr<SkTypeface>& typeface,
                                      const std::string& name,
                                      int size,
                                      int style) {
   InitFromDetails(typeface, name, size, style);
 }
 
 PlatformFontPango::~PlatformFontPango() {}
 
-// static
-std::string PlatformFontPango::GetDefaultFont() {
-#if defined(OS_CHROMEOS)
-  // Font name must have been provided by way of SetDefaultFontDescription().
-  CHECK(default_font_description_);
-  return *default_font_description_;
-#else
-  const gfx::LinuxFontDelegate* delegate = gfx::LinuxFontDelegate::instance();
-  return delegate ? delegate->GetDefaultFontDescription() : "sans 10";
-#endif    // defined(OS_CHROMEOS)
-}
-
 void PlatformFontPango::InitFromDetails(
     const skia::RefPtr<SkTypeface>& typeface,
     const std::string& font_family,
     int font_size,
     int style) {
   DCHECK_GT(font_size, 0);
 
   typeface_ = typeface;
   font_family_ = font_family;
   if (!typeface_) {
@@ skipping 104 matching lines @@
   return new PlatformFontPango(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontPango(font_name, font_size);
 }
 
 }  // namespace gfx