aura: A few changes to have aura_demo compile and run on linux.

ui/gfx/platform_font_gtk.cc

 // Copyright (c) 2011 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_gtk.h"
 
 #include <algorithm>
 #include <fontconfig/fontconfig.h>
 #include <map>
 #include <pango/pango.h>
 #include <string>
 
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
-#include "ui/gfx/gtk_util.h"
+#include "ui/gfx/linux_util.h"
 
 #if !defined(USE_WAYLAND)
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #endif
 
 namespace {
 
 // The font family name which is used when a user's application font for
 // GNOME/KDE is a non-scalable one. The name should be listed in the
@@ skipping 431 matching lines @@
   return new PlatformFontGtk(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const string16& font_name,
                                                   int font_size) {
   return new PlatformFontGtk(font_name, font_size);
 }
 
 }  // namespace gfx