Add DisplayCompositorTest.

services/ui/ws/BUILD.gn

 # Copyright 2014 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/ui.gni")
 import("//testing/test.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 static_library("lib") {
@@ skipping 179 matching lines @@
   deps = [
     ":mus_ws_unittests",
   ]
   if (!is_android) {
     deps += [ "//services/ui/public/cpp/tests:mus_public_unittests" ]
   }
 }
 
 test("mus_ws_unittests") {
   sources = [
+    # TODO(fsamuel): Move this test with DisplayCompositor. crbug.com/670454
+    "../surfaces/display_compositor_unittest.cc",
     "animation_runner_unittest.cc",
     "cursor_unittest.cc",
     "display_unittest.cc",
     "drag_controller_unittest.cc",
     "event_dispatcher_unittest.cc",
     "event_matcher_unittest.cc",
     "focus_controller_unittest.cc",
     "frame_generator_unittest.cc",
     "scheduled_animation_group_unittest.cc",
     "server_window_compositor_frame_sink_manager_test_api.cc",
@@ skipping 36 matching lines @@
     "//testing/gtest",
     "//third_party/mesa:osmesa",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",
     "//ui/gl",
   ]
 
+  # TODO(fsamuel): Remove this dep. crbug.com/670454
+  deps += [ "//services/ui/surfaces" ]
+
   if (use_x11) {
     deps += [ "//tools/xdisplaycheck" ]
   }
 
   data_deps = [
     ":mus_ws_unittests_app_manifest",
   ]
 }
 
 service_manifest("mus_ws_unittests_app_manifest") {
   name = "mus_ws_unittests_app"
   source = "mus_ws_unittests_app_manifest.json"
 }