Skia roll 0c88d82:a17aac8 with fixed build exclusions.

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 307 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/src/utils/SkThreadPool.h",
-  "//third_party/skia/src/utils/SkCondVar.cpp",
 
   "//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",
@@ skipping 128 matching lines @@
     ]
   }
 
   # Select the right BitmapPlatformDevice.
   if (is_win) {
     sources += [
       "ext/bitmap_platform_device_win.cc",
       "ext/bitmap_platform_device_win.h",
     ]
   } else if (is_mac) {
-    sources += [ 
+    sources += [
       "ext/bitmap_platform_device_mac.cc",
       "ext/bitmap_platform_device_mac.h",
     ]
   } else if (use_cairo) {
     sources += [
       "ext/bitmap_platform_device_cairo.cc",
       "ext/bitmap_platform_device_cairo.h",
     ]
   } else {
     sources += [
@@ skipping 204 matching lines @@
     ":skia_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = ":skia"
 }