Update from https://crrev.com/306655
Includes updates to ui/ and mojo/services for cc and gpu changes and
a minor update to a unit test in sky/ for skia interface changes.
Review URL: https://codereview.chromium.org/761903003
diff --git a/url/url_constants.cc b/url/url_constants.cc
index 9ef0e63..2dc1478 100644
--- a/url/url_constants.cc
+++ b/url/url_constants.cc
@@ -10,6 +10,7 @@
const char kAboutScheme[] = "about";
const char kBlobScheme[] = "blob";
+const char kContentScheme[] = "content";
const char kDataScheme[] = "data";
const char kFileScheme[] = "file";
const char kFileSystemScheme[] = "filesystem";
