Splitting the Mus demo code out of a service.

services/ui/demo/mus_demo.cc

Index: services/ui/demo/mus_demo.cc
diff --git a/services/ui/demo/mus_demo.cc b/services/ui/demo/mus_demo.cc
index d528244a6a6f51ae65b07e2831ba90d64764fef1..9bdaafc41dc26a0790bea052edb2ec6f27f4572e 100644
--- a/services/ui/demo/mus_demo.cc
+++ b/services/ui/demo/mus_demo.cc
@@ -63,15 +63,10 @@ MusDemo::MusDemo() {}
 
 MusDemo::~MusDemo() {}
 
-void MusDemo::OnStart(const service_manager::Identity& identity) {
-  gpu_service_ = GpuService::Create(connector());
+void MusDemo::Start(service_manager::Connector* connector) {
+  gpu_service_ = GpuService::Create(connector);
   window_tree_client_ = base::MakeUnique<WindowTreeClient>(this, this);
-  window_tree_client_->ConnectAsWindowManager(connector());
-}
-
-bool MusDemo::OnConnect(const service_manager::Identity& remote_identity,
-                        service_manager::InterfaceRegistry* registry) {
-  return true;
+  window_tree_client_->ConnectAsWindowManager(connector);
 }
 
 void MusDemo::OnEmbed(Window* window) {
@@ -154,6 +149,12 @@ void MusDemo::AllocBitmap() {
 }
 
 void MusDemo::DrawFrame() {
+  base::TimeTicks now = base::TimeTicks::Now();
+
+  VLOG(1) << (now - last_draw_frame_time_).InMilliseconds()
+          << "ms since the last frame was drawn.";
+  last_draw_frame_time_ = now;
+
   angle_ += 2.0;
   if (angle_ >= 360.0)
     angle_ = 0.0;
@@ -184,9 +185,15 @@ void MusDemo::DrawFrame() {
       new std::vector<unsigned char>(addr, addr + bytes));
   bitmap_.unlockPixels();
 
+#if defined(OS_ANDROID)

[rjkroege, 2016/10/20 21:44:32]

feel free to add a todo here to make this not require an #ifdef

[Jay Civelli, 2016/10/21 17:16:11]

Done.

+  BitmapUploader::Format bitmap_format = BitmapUploader::RGBA;
+#else
+  BitmapUploader::Format bitmap_format = BitmapUploader::BGRA;
+#endif
+
   // Send frame to MUS via BitmapUploader.
   uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data),
-                       BitmapUploader::BGRA);
+                       bitmap_format);
 }
 
 }  // namespace demo