Move bitmap uploader to ui service client lib

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/bitmap_uploader.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 ui {
@@ skipping 89 matching lines @@
     const std::set<Window*>& client_windows,
     bool janky) {
   // Don't care
 }
 
 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_.reset(new ui::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(Window* window,
                                   mojom::MoveLoopSource source,
@@ skipping 40 matching lines @@
   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();
 
   // Send frame to MUS via BitmapUploader.
   uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data),
-                       bitmap_uploader::BitmapUploader::BGRA);
+                       ui::BitmapUploader::BGRA);
 }
 
 }  // namespace demo
 }  // namespace ui