Update skia and ui GN builds

skia/BUILD.gn

 # Copyright (c) 2013 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/features.gni")
 import("//build/config/ui.gni")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
 
@@ skipping 316 matching lines @@
       "//third_party/skia/src/ports/SkOSFile_posix.cpp",
       "//third_party/skia/src/ports/SkTime_Unix.cpp",
       "//third_party/skia/src/ports/SkTLS_pthread.cpp",
     ]
   } else {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_win.cpp",
       "//third_party/skia/src/ports/SkFontHost_win_dw.cpp",
       "//third_party/skia/src/ports/SkFontMgr_default_gdi.cpp",
       "//third_party/skia/src/ports/SkOSFile_win.cpp",
+      "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
-      "//third_party/skia/src/utils/SkThreadUtils_win.cpp",
     ]
   }
   if (!is_android) {
     sources -= [
       "//third_party/skia/src/ports/SkFontConfigInterface_android.cpp",
       "//third_party/skia/src/ports/SkFontConfigParser_android.cpp",
     ]
   }
   if (!is_mac) {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_mac.cpp",
-      "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
     ]
   }
+
   if (!is_linux) {
     sources -= [
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
+      "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
+      "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
-      "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-      "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
-      "//third_party/skia/src/ports/SkFontHost_linux.cpp",
-      "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
-    ]
-  } else if (!is_android) {
-    sources -= [
-      "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
     ]
   }
-  if (!is_posix) {
-    sources -= [
-      "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
-    ]
-  }
-
-  sources -= [
-    # This file is a stub for systems that use pthreads but aren't covered by
-    # one of the more specific pthread files. We don't support any such
-    # systems.
-    "//third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp",
-  ]
 
   if (!use_cairo) {
     sources -= [
       "ext/bitmap_platform_device_cairo.cc",
       "ext/bitmap_platform_device_cairo.h",
     ]
   }
 
   if (is_clang) {
     # Skia won't compile with some of the more strict clang warnings.
@@ skipping 170 matching lines @@
     ":skia_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = ":skia"
 }