Rationalize linux vs x11 in ui

ui/gfx/pango_util.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/pango_util.h"
 
 #include <cairo/cairo.h>
 #include <fontconfig/fontconfig.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ skipping 105 matching lines @@
     pixels_in_point = pango_dpi / 72.0;  // 72 points in an inch
     determined_value = true;
   }
 
   return pixels_in_point;
 }
 
 }  // namespace
 
 PangoContext* GetPangoContext() {
-#if defined(USE_AURA)
+#if defined(TOOLKIT_GTK)
+  return gdk_pango_context_get();
+#else
   PangoFontMap* font_map = pango_cairo_font_map_get_default();
   return pango_font_map_create_context(font_map);
-#else
-  return gdk_pango_context_get();
 #endif
 }
 
 double GetPangoResolution() {
   static double resolution;
   static bool determined_resolution = false;
   if (!determined_resolution) {
     determined_resolution = true;
     PangoContext* default_context = GetPangoContext();
     resolution = pango_cairo_context_get_resolution(default_context);
@@ skipping 266 matching lines @@
 
   if (i == desc_to_metrics->end()) {
     PangoFontMetrics* metrics = pango_context_get_metrics(context, desc, NULL);
     desc_to_metrics->insert(std::make_pair(desc_hash, metrics));
     return metrics;
   }
   return i->second;
 }
 
 }  // namespace gfx