ozone: Fix GN build for ozone_egl_demo, ozone_unittests

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")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
-if (use_ozone) {
-  import("//ui/ozone/ozone.gni")
-}
 
 # Several targets want to include this header file, and some of them are
 # child dependencies of "gfx". Therefore, we separate it out here so multiple
 # targets can all have a dependency for header checking purposes without
 # creating circular dependencies.
 source_set("gfx_export") {
   sources = [
     "gfx_export.h",
   ]
 }
@@ skipping 290 matching lines @@
 
   # Linux.
   if (is_linux) {
     configs += [ "//build/config/linux:fontconfig" ]
   }
 
   # Ozone stuff.
   if (use_ozone) {
     sources += [
       "platform_font_ozone.cc",
-      "ozone/impl/file_surface_factory.cc",
-      "ozone/impl/file_surface_factory.h",
-      "ozone/surface_factory_ozone.cc",
-      "ozone/surface_factory_ozone.h",
-      "ozone/surface_ozone.h",
-      "ozone/overlay_candidates_ozone.cc",
-      "ozone/overlay_candidates_ozone.h",
     ]
   }
 
   if (!use_aura) {
     sources -= [
       "nine_image_painter.cc",
       "nine_image_painter.h",
       "path_aura.cc",
       "screen_aura.cc",
     ]
@@ skipping 11 matching lines @@
 
   if (use_pango) {
     sources += [
       "pango_util.cc",
       "pango_util.h",
       "platform_font_pango.cc",
       "platform_font_pango.h",
     ]
     configs += [ "//build/config/linux:pangocairo" ]
   }
+  if (use_pango && use_ozone) {
+    sources -= [
+      "platform_font_ozone.cc",
+    ]
+  }
 }
 
 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry
 
 source_set("test_support") {
   sources = [
     "test/fontconfig_util_linux.cc",
     "test/fontconfig_util_linux.h",
     "test/gfx_util.cc",
     "test/gfx_util.h",
@@ skipping 64 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"
   }
 }