Move bitmap uploader to ui service client lib

ui/views/mus/native_widget_mus.cc

 // Copyright 2015 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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/bitmap_uploader/bitmap_uploader.h"
 #include "services/ui/common/gpu_service.h"
+#include "services/ui/public/cpp/bitmap_uploader.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_observer.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/aura/client/default_capture_client.h"
@@ skipping 514 matching lines @@
     context_factory_.reset(
         new SurfaceContextFactory(connector, window_, surface_type_));
     aura::Env::GetInstance()->set_context_factory(context_factory_.get());
   } else if (!ui::GpuService::UseChromeGpuCommandBuffer()) {
     // Only use the BitmapUploader when the mojo command buffer is being used.
     needs_bitmap_uploader = true;
   }
 
   window_tree_host_.reset(new WindowTreeHostMus(this, window_));
   if (needs_bitmap_uploader) {
-    bitmap_uploader_.reset(new bitmap_uploader::BitmapUploader(window));
+    bitmap_uploader_.reset(new ui::BitmapUploader(window));
     bitmap_uploader_->Init(connector);
     prop_ = base::MakeUnique<ui::ViewProp>(
         window_tree_host_->GetAcceleratedWidget(),
-        bitmap_uploader::kBitmapUploaderForAcceleratedWidget,
+        ui::kBitmapUploaderForAcceleratedWidget,
         bitmap_uploader_.get());
   }
 
   aura::Env::GetInstance()->set_context_factory(default_context_factory);
 }
 
 NativeWidgetMus::~NativeWidgetMus() {
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) {
     DCHECK(!window_);
     delete native_widget_delegate_;
@@ skipping 875 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views