Unsplit the MUS demo.

services/ui/demo/BUILD.gn

 # Copyright 2016 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("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
-service("mus_demo") {
-  sources = [
-    "main.cc",
-    "mus_demo_service.cc",
-    "mus_demo_service.h",
-  ]
-
-  deps = [
-    ":mus_demo_lib",
-    "//mojo/public/cpp/bindings",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/cpp:sources",
-  ]
-
-  data_deps = [
-    ":manifest",
-  ]
-}
-
-static_library("mus_demo_lib") {
+source_set("lib") {
   sources = [
     "bitmap_uploader.cc",
     "bitmap_uploader.h",
     "mus_demo.cc",
     "mus_demo.h",
   ]
 
   public_deps = [
+    "//services/service_manager/public/cpp:sources",
     "//skia",
   ]
 
   deps = [
     "//base",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
     "//services/ui/public/cpp",
     "//services/ui/public/cpp:internal",
     "//services/ui/public/interfaces",
     "//ui/gfx/geometry",
   ]
+}
+
+service("mus_demo") {
+  sources = [
+    "main.cc",
+  ]
+
+  deps = [
+    ":lib",
+  ]
 
   data_deps = [
     ":manifest",
     "//services/ui",
   ]
 }
 
 service_manifest("manifest") {
   name = "mus_demo"
   source = "manifest.json"
@@ skipping 26 matching lines @@
     ":mus_demo",
     ":test_manifest",
   ]
 }
 
 group("demo") {
   deps = [
     ":mus_demo",
   ]
 }