Move bitmap uploader to ui service client lib

services/ui/demo/mus_demo.h

 // 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.
 
 #ifndef SERVICES_UI_DEMO_MUS_DEMO_H_
 #define SERVICES_UI_DEMO_MUS_DEMO_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-namespace bitmap_uploader {
+namespace ui {
 class BitmapUploader;
-}
-
-namespace ui {
 namespace demo {
 
 // A simple MUS Demo mojo app. This app connects to the mojo:ui, creates a new
 // window and draws a spinning square in the center of the window. Provides a
 // simple way to demonstrate that the graphic stack works as intended.
 class MusDemo : public shell::Service,
                 public WindowTreeClientDelegate,
                 public WindowManagerDelegate {
  public:
   MusDemo();
@@ skipping 34 matching lines @@
 
   // Draws one frame, incrementing the rotation angle.
   void DrawFrame();
 
   shell::Connector* connector_ = nullptr;
 
   Window* window_ = nullptr;
   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_;
 
   // Timer for calling DrawFrame().
   base::RepeatingTimer timer_;
 
   // Current rotation angle for drawing.
   double angle_ = 0.0;
 
   DISALLOW_COPY_AND_ASSIGN(MusDemo);
 };
 
 }  // namespace demo
 }  // namespace ui
 
 #endif  // SERVICES_UI_DEMO_MUS_DEMO_H_