Update from https://crrev.com/306724

This one actually contains the BUILD.gn reformats and updates
net_sql.patch and skia_build.patch to apply.

Review URL: https://codereview.chromium.org/774413002

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index feece8d..3bffec2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -60,9 +60,7 @@
   configs += [ ":url_icu_config" ]
 
   if (is_win) {
-    cflags = [
-      "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    ]
+    cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   }
 
   deps = [
@@ -124,12 +122,8 @@
     ]
 
     if (use_icu_alternatives_on_android) {
-      sources -= [
-        "url_canon_icu_unittest.cc",
-      ]
-      deps -= [
-        "//third_party/icu:icuuc",
-      ]
+      sources -= [ "url_canon_icu_unittest.cc" ]
+      deps -= [ "//third_party/icu:icuuc" ]
     }
   }
 }