Add unit test for 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/time/time.h"
 #include "components/bitmap_uploader/bitmap_uploader.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/gpu_service.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace mus_demo {
+namespace ui {
+namespace demo {
 
 namespace {
 
 // Milliseconds between frames.
 const int64_t kFrameDelay = 33;
 
 // Size of square in pixels to draw.
 const int kSquareSize = 300;
 
 const SkColor kBgColor = SK_ColorRED;
@@ skipping 29 matching lines @@
 MusDemo::MusDemo() {}
 
 MusDemo::~MusDemo() {
   delete window_tree_client_;
 }
 
 void MusDemo::OnStart(shell::Connector* connector,
                       const shell::Identity& identity,
                       uint32_t id) {
   connector_ = connector;
-  ui::GpuService::Initialize(connector_);
-  window_tree_client_ = new ui::WindowTreeClient(this, this, nullptr);
+  GpuService::Initialize(connector_);
+  window_tree_client_ = new WindowTreeClient(this, this, nullptr);
   window_tree_client_->ConnectAsWindowManager(connector);
 }
 
 bool MusDemo::OnConnect(shell::Connection* connection) {
   return true;
 }
 
-void MusDemo::OnEmbed(ui::Window* window) {
+void MusDemo::OnEmbed(Window* window) {
   // Not called for the WindowManager.
   NOTREACHED();
 }
 
-void MusDemo::OnDidDestroyClient(ui::WindowTreeClient* client) {
+void MusDemo::OnDidDestroyClient(WindowTreeClient* client) {
   window_tree_client_ = nullptr;
   timer_.Stop();
 }
 
-void MusDemo::OnEventObserved(const ui::Event& event, ui::Window* target) {}
+void MusDemo::OnEventObserved(const Event& event, Window* target) {}
 
-void MusDemo::SetWindowManagerClient(ui::WindowManagerClient* client) {}
+void MusDemo::SetWindowManagerClient(WindowManagerClient* client) {}
 
-bool MusDemo::OnWmSetBounds(ui::Window* window, gfx::Rect* bounds) {
+bool MusDemo::OnWmSetBounds(Window* window, gfx::Rect* bounds) {
   return true;
 }
 
-bool MusDemo::OnWmSetProperty(ui::Window* window,
+bool MusDemo::OnWmSetProperty(Window* window,
                               const std::string& name,
                               std::unique_ptr<std::vector<uint8_t>>* new_data) {
   return true;
 }
 
-ui::Window* MusDemo::OnWmCreateTopLevelWindow(
+Window* MusDemo::OnWmCreateTopLevelWindow(
     std::map<std::string, std::vector<uint8_t>>* properties) {
   return nullptr;
 }
 
 void MusDemo::OnWmClientJankinessChanged(
-    const std::set<ui::Window*>& client_windows,
+    const std::set<Window*>& client_windows,
     bool janky) {
   // Don't care
 }
 
-void MusDemo::OnWmNewDisplay(ui::Window* window,
-                             const display::Display& display) {
+void MusDemo::OnWmNewDisplay(Window* window, const display::Display& display) {
   DCHECK(!window_);  // Only support one display.
   window_ = window;
 
   // Initialize bitmap uploader for sending frames to MUS.
   uploader_.reset(new bitmap_uploader::BitmapUploader(window_));
   uploader_->Init(connector_);
 
   // Draw initial frame and start the timer to regularly draw frames.
   DrawFrame();
   timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kFrameDelay),
                base::Bind(&MusDemo::DrawFrame, base::Unretained(this)));
 }
 
-void MusDemo::OnWmPerformMoveLoop(ui::Window* window,
-                                  ui::mojom::MoveLoopSource source,
+void MusDemo::OnWmPerformMoveLoop(Window* window,
+                                  mojom::MoveLoopSource source,
                                   const gfx::Point& cursor_location,
                                   const base::Callback<void(bool)>& on_done) {
   // Don't care
 }
 
-void MusDemo::OnWmCancelMoveLoop(ui::Window* window) {}
+void MusDemo::OnWmCancelMoveLoop(Window* window) {}
 
 void MusDemo::AllocBitmap() {
   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);
 }
@@ skipping 27 matching lines @@
   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();
 
   // Send frame to MUS via BitmapUploader.
   uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data),
                        bitmap_uploader::BitmapUploader::BGRA);
 }
 
-}  // namespace ui_demo
+}  // namespace demo
+}  // namespace ui