Update from chromium https://crrev.com/302282

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 310 matching lines @@
   }
 
   # GPU
   if (skia_support_gpu) {
     sources += gypi_skia_gpu.skgpu_sources
     sources += gypi_skia_gpu.skgpu_null_gl_sources
   }
 
   # Remove unused util files include in utils.gypi
   sources -= [
-  "//third_party/skia/src/utils/SkCondVar.cpp",
-  "//third_party/skia/src/utils/SkCondVar.h",
-  "//third_party/skia/src/utils/SkRunnable.h",
-
   "//third_party/skia/include/utils/SkBoundaryPatch.h",
   "//third_party/skia/include/utils/SkFrontBufferedStream.h",
   "//third_party/skia/include/utils/SkCamera.h",
   "//third_party/skia/include/utils/SkCanvasStateUtils.h",
   "//third_party/skia/include/utils/SkCubicInterval.h",
   "//third_party/skia/include/utils/SkCullPoints.h",
   "//third_party/skia/include/utils/SkDebugUtils.h",
   "//third_party/skia/include/utils/SkDumpCanvas.h",
   "//third_party/skia/include/utils/SkEventTracer.h",
   "//third_party/skia/include/utils/SkInterpolator.h",
@@ skipping 24 matching lines @@
   "//third_party/skia/src/utils/SkMD5.h",
   "//third_party/skia/src/utils/SkMeshUtils.cpp",
   "//third_party/skia/src/utils/SkNinePatch.cpp",
   "//third_party/skia/src/utils/SkOSFile.cpp",
   "//third_party/skia/src/utils/SkParse.cpp",
   "//third_party/skia/src/utils/SkParseColor.cpp",
   "//third_party/skia/src/utils/SkParsePath.cpp",
   "//third_party/skia/src/utils/SkPathUtils.cpp",
   "//third_party/skia/src/utils/SkSHA1.cpp",
   "//third_party/skia/src/utils/SkSHA1.h",
-  "//third_party/skia/src/utils/SkThreadUtils.h",
-  "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
-  "//third_party/skia/src/utils/SkThreadUtils_pthread.h",
-  "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
-  "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
-  "//third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp",
-  "//third_party/skia/src/utils/SkThreadUtils_win.cpp",
   "//third_party/skia/src/utils/SkTFitsIn.h",
   "//third_party/skia/src/utils/SkTLogic.h",
 
+  # We don't currently need to change thread affinity, so leave out this complexity for now.
+  "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
+  "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
+
   #testing
   "//third_party/skia/src/fonts/SkGScalerContext.cpp",
   "//third_party/skia/src/fonts/SkGScalerContext.h",
   ]
 
+  if (is_win) {
+    sources -= [
+      # Keeping _win.cpp
+      "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
+      "//third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp",
+    ]
+  } else {
+    sources -= [
+      # Keeping _pthread.cpp and _pthread_other.cpp.
+      "//third_party/skia/src/utils/SkThreadUtils_win.cpp",
+    ]
+  }
+
   # need separate win section to handle chromes auto gn filter
   # (build/config/BUILDCONFIG.gn)
   if (is_win) {
     sources -= [
-      "//third_party/skia/src/utils/SkThreadUtils_win.h",
-
       #windows
       "//third_party/skia/include/utils/win/SkAutoCoInitialize.h",
       "//third_party/skia/include/utils/win/SkHRESULT.h",
       "//third_party/skia/include/utils/win/SkIStream.h",
       "//third_party/skia/include/utils/win/SkTScopedComPtr.h",
       "//third_party/skia/src/utils/win/SkAutoCoInitialize.cpp",
       "//third_party/skia/src/utils/win/SkIStream.cpp",
       "//third_party/skia/src/utils/win/SkWGL_win.cpp",
     ]
   }
@@ skipping 294 matching lines @@
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = [ ":skia" ]
 }