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

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index a12a29c8884414dde48436ddb7cf03f7a5ac31ac..5dd70ac24d7d7692b111a8171057548270855d4d 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -328,10 +328,6 @@ component("skia") {
 
   # 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",
@@ -376,27 +372,35 @@ component("skia") {
   "//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",