Move bitmap uploader to ui service client lib

services/ui/demo/mus_demo.h

Index: services/ui/demo/mus_demo.h
diff --git a/services/ui/demo/mus_demo.h b/services/ui/demo/mus_demo.h
index 99527e696818bfd5d2b4f09ff17fa44ed0601209..65d285a1ee5ca2eebc942e8133bc4cdb890b150b 100644
--- a/services/ui/demo/mus_demo.h
+++ b/services/ui/demo/mus_demo.h
@@ -19,11 +19,8 @@
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-namespace bitmap_uploader {
-class BitmapUploader;
-}
-
 namespace ui {
+class BitmapUploader;
 namespace demo {
 
 // A simple MUS Demo mojo app. This app connects to the mojo:ui, creates a new
@@ -78,7 +75,7 @@ class MusDemo : public shell::Service,
   WindowTreeClient* window_tree_client_ = nullptr;
 
   // Used to send frames to mus.
-  std::unique_ptr<bitmap_uploader::BitmapUploader> uploader_;
+  std::unique_ptr<ui::BitmapUploader> uploader_;
 
   // Bitmap that is the same size as our client window area.
   SkBitmap bitmap_;