The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5b4fdf8aaf344ec97c6e9dc3fc9c78469d04f9c7

commit 5b4fdf8aaf344ec97c6e9dc3fc9c78469d04f9c7
Author: jcivelli <jcivelli@chromium.org>
Date: Mon Oct 31 20:51:02 2016

Unsplit the MUS demo code back into just one service, as it turns out
the Android MUS demo can connect to the service instead of calling the
demo directly.

BUG= 660623 

Review-Url: https://codereview.chromium.org/2459123003
Cr-Commit-Position: refs/heads/master@{#428801}

[modify] https://crrev.com/5b4fdf8aaf344ec97c6e9dc3fc9c78469d04f9c7/services/ui/demo/BUILD.gn
[modify] https://crrev.com/5b4fdf8aaf344ec97c6e9dc3fc9c78469d04f9c7/services/ui/demo/main.cc
[modify] https://crrev.com/5b4fdf8aaf344ec97c6e9dc3fc9c78469d04f9c7/services/ui/demo/mus_demo.cc
[modify] https://crrev.com/5b4fdf8aaf344ec97c6e9dc3fc9c78469d04f9c7/services/ui/demo/mus_demo.h
[delete] https://crrev.com/a2e43fd11af2b7812912a6b76020905999c1cd59/services/ui/demo/mus_demo_service.cc
[delete] https://crrev.com/a2e43fd11af2b7812912a6b76020905999c1cd59/services/ui/demo/mus_demo_service.h
[modify] https://crrev.com/5b4fdf8aaf344ec97c6e9dc3fc9c78469d04f9c7/services/ui/public/cpp/BUILD.gn