diff --git a/DEPS b/DEPS
index bebcddb..f49c2fe 100644
--- a/DEPS
+++ b/DEPS
@@ -40,7 +40,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'cd25f63484badeac976b91506ce67a7dbd3c904c',
+  'skia_revision': '7f810b4e1076c646b9ec7dd939ccaa1f87c659d4',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 285238f..49fc34f 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -133,7 +133,6 @@
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "device_monitors/system_message_window_win_unittest.cc",
     "filters/audio_clock_unittest.cc",
     "filters/audio_decoder_selector_unittest.cc",
     "filters/audio_renderer_algorithm_unittest.cc",
@@ -330,6 +329,7 @@
     "//media/audio:unit_tests",
     "//media/base:unit_tests",
     "//media/cdm:unit_tests",
+    "//media/device_monitors:unit_tests",
     "//media/gpu:unit_tests",
     "//media/mojo:unit_tests",
     "//media/renderers:unit_tests",
diff --git a/media/device_monitors/BUILD.gn b/media/device_monitors/BUILD.gn
index aaae3476..d24b07e 100644
--- a/media/device_monitors/BUILD.gn
+++ b/media/device_monitors/BUILD.gn
@@ -34,3 +34,18 @@
     libs = [ "Foundation.framework" ]
   }
 }
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "system_message_window_win_unittest.cc",
+  ]
+
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//media:test_support",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}