Splitting the Mus demo code out of a service.

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::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) {
   // Not called for the WindowManager.
   NOTREACHED();
 }
 
 void MusDemo::OnEmbedRootDestroyed(Window* root) {
   // Not called for the WindowManager.
   NOTREACHED();
@@ skipping 62 matching lines @@
   const gfx::Rect bounds = window_->GetBoundsInRoot();
 
   // Allocate bitmap the same size as the window for drawing.
   bitmap_.reset();
   SkImageInfo image_info = SkImageInfo::MakeN32(bounds.width(), bounds.height(),
                                                 kPremul_SkAlphaType);
   bitmap_.allocPixels(image_info);
 }
 
 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;
 
   const gfx::Rect bounds = window_->GetBoundsInRoot();
 
   // Check that bitmap and window sizes match, otherwise reallocate bitmap.
   const SkImageInfo info = bitmap_.info();
   if (info.width() != bounds.width() || info.height() != bounds.height()) {
     AllocBitmap();
@@ skipping 10 matching lines @@
   // TODO(rjkroege): Make a 1/0-copy bitmap uploader for the contents of a
   // SkBitmap.
   bitmap_.lockPixels();
   const unsigned char* addr =
       static_cast<const unsigned char*>(bitmap_.getPixels());
   const int bytes = bounds.width() * bounds.height() * 4;
   std::unique_ptr<std::vector<unsigned char>> data(
       new std::vector<unsigned char>(addr, addr + bytes));
   bitmap_.unlockPixels();
 
+#if defined(OS_ANDROID)
+  // TODO(jcivelli): find a way to not have an ifdef here.
+  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
 }  // namespace ui