Revert of Fixes for two different HUD issues related to win32k lockdown (patchset #9 id:350001 of h…

ui/gfx/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 87 matching lines @@
     "font_render_params_linux.cc",
     "font_render_params_mac.cc",
     "font_render_params_win.cc",
     "frame_time.h",
     "gdi_util.cc",
     "gdi_util.h",
     "gfx_paths.cc",
     "gfx_paths.h",
     "gpu_memory_buffer.cc",
     "gpu_memory_buffer.h",
-    "hud_font.cc",
-    "hud_font.h",
     "icon_util.cc",
     "icon_util.h",
     "image/canvas_image_source.cc",
     "image/canvas_image_source.h",
     "image/image.cc",
     "image/image.h",
     "image/image_family.cc",
     "image/image_family.h",
     "image/image_ios.mm",
     "image/image_mac.mm",
@@ skipping 182 matching lines @@
     libs = [
       "android",
       "jnigraphics",
     ]
   } else {
     sources -= [ "canvas_notimplemented.cc" ]
   }
 
   # Windows.
   if (is_win) {
-    cflags = [
-      "/wd4324",  # Structure was padded due to __declspec(align()), which is
-                  # uninteresting.
-    ]
+    cflags = [ "/wd4324" ]  # Structure was padded due to __declspec(align()), which is
+                            # uninteresting.
   } else {
     sources -= [
       "gdi_util.cc",
       "gdi_util.h",
       "icon_util.cc",
       "icon_util.h",
     ]
   }
 
   # Linux.
@@ skipping 196 matching lines @@
 if (is_android) {
   generate_jni("gfx_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
       "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
       "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
     ]
     jni_package = "gfx"
   }
 }