Update from https://crrev.com/312398

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")
+import("//testing/test.gni")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
-if (is_android) {
-  import("//build/config/android/rules.gni")
-}
 
 skia_support_gpu = !is_ios
 skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview)
 
 # The list of Skia defines that are to be set for chromium.
 gypi_skia_defines =
     exec_script("//build/gypi_to_gn.py",
                 [
                   rebase_path(
                       "//third_party/skia/gyp/skia_for_chromium_defines.gypi"),
@@ skipping 449 matching lines @@
   if (is_win) {
     sources += [
       "ext/bitmap_platform_device_win.cc",
       "ext/bitmap_platform_device_win.h",
     ]
   } else if (is_mac) {
     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 += [
       "ext/bitmap_platform_device_skia.cc",
       "ext/bitmap_platform_device_skia.h",
     ]
   }
 
   if (is_clang) {
     # Skia won't compile with some of the more strict clang warnings.
     # e.g. it does:
@@ skipping 20 matching lines @@
       # Some files define WIN32_LEAN_AND_MEAN and we want to avoid a duplicate
       # definition warning.
       "//build/config/win:lean_and_mean",
     ]
   }
 
   if (is_linux) {
     configs += [
       "//build/config/linux:fontconfig",
       "//build/config/linux:freetype2",
+      "//build/config/linux:pangocairo",
     ]
     deps += [ "//third_party/icu:icuuc" ]
   }
 
   if (is_android) {
     set_sources_assignment_filter([])
     sources += [ "ext/platform_device_linux.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
     deps += [
       "//third_party/expat",
@@ skipping 188 matching lines @@
 
   deps = [
     ":skia",
     "//base",
     "//base/test:run_all_unittests",
     "//testing/gtest",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 }
-
-if (is_android) {
-  # GYP: //skia/skia_tests.gyp:skia_unittests_apk
-  unittest_apk("skia_unittests_apk") {
-    unittests_dep = ":skia_unittests"
-    deps = [
-      ":skia_unittests",
-    ]
-  }
-}