Support FontRenderParams on Win; fix RenderTextHarfBuzz.

ui/gfx/font_render_params_linux.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/font_render_params_linux.h"
+#include "ui/gfx/font_render_params.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "ui/gfx/switches.h"
 
 #include <fontconfig/fontconfig.h>
 
-#if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "ui/gfx/linux_font_delegate.h"
 #endif
 
 namespace gfx {
 
 namespace {
 
 bool SubpixelPositioningRequested(bool renderer) {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       renderer ? switches::kEnableWebkitTextSubpixelPositioning
@@ skipping 31 matching lines @@
     case FC_RGBA_VRGB:
       params->subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_VRGB;
       break;
     case FC_RGBA_VBGR:
       params->subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_VBGR;
       break;
     default:
       params->subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE;
   }
 
-#if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   const LinuxFontDelegate* delegate = LinuxFontDelegate::instance();
   if (delegate) {
     params->antialiasing = delegate->UseAntialiasing();
     params->hinting = delegate->GetHintingStyle();
     params->subpixel_rendering = delegate->GetSubpixelRenderingStyle();
   }
 #endif
 
   params->subpixel_positioning = SubpixelPositioningRequested(renderer);
 
@@ skipping 20 matching lines @@
     LoadDefaults(&default_params, /* renderer */ true);
   loaded_defaults = true;
   return default_params;
 }
 
 bool GetDefaultWebkitSubpixelPositioning() {
   return SubpixelPositioningRequested(true);
 }
 
 }  // namespace gfx