Unsplit the MUS demo.

services/ui/demo/mus_demo.cc

 // 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.
 
 #include "services/ui/demo/mus_demo.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/demo/bitmap_uploader.h"
@@ skipping 45 matching lines @@
 
   canvas->drawRect(rect, paint);
 }
 
 }  // namespace
 
 MusDemo::MusDemo() {}
 
 MusDemo::~MusDemo() {}
 
-void MusDemo::Start(service_manager::Connector* connector) {
-  gpu_service_ = GpuService::Create(connector);
+void MusDemo::OnStart(const service_manager::ServiceInfo& info) {
+  gpu_service_ = GpuService::Create(connector());
   window_tree_client_ = base::MakeUnique<WindowTreeClient>(this, this);
-  window_tree_client_->ConnectAsWindowManager(connector);
+  window_tree_client_->ConnectAsWindowManager(connector());
+}
+
+bool MusDemo::OnConnect(const service_manager::ServiceInfo& remote_info,
+                        service_manager::InterfaceRegistry* registry) {
+  return true;
 }
 
 void MusDemo::OnEmbed(Window* window) {
   // Not called for the WindowManager.
   NOTREACHED();
 }
 
 void MusDemo::OnEmbedRootDestroyed(Window* root) {
   // Not called for the WindowManager.
   NOTREACHED();
@@ skipping 114 matching lines @@
   BitmapUploader::Format bitmap_format = BitmapUploader::BGRA;
 #endif
 
   // Send frame to MUS via BitmapUploader.
   uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data),
                        bitmap_format);
 }
 
 }  // namespace demo
 }  // namespace ui