services/ui: Move cc::SoftwareOutputDevice implementation into the client lib.

content/browser/compositor/gpu_process_transport_factory.cc

Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index ff60da4fd76de8cd448dacacfbe15acfb5b76f92..6067a6ae6644ded68cc39e7e4afb8eadade65335 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -38,7 +38,6 @@
 #include "content/browser/compositor/offscreen_browser_compositor_output_surface.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/browser/compositor/software_browser_compositor_output_surface.h"
-#include "content/browser/compositor/software_output_device_mus.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ -62,6 +61,7 @@
 #include "content/browser/compositor/mus_browser_compositor_output_surface.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "services/ui/common/gpu_service.h"
+#include "services/ui/public/cpp/software_output_device.h"
 #endif
 
 #if defined(OS_WIN)
@@ -203,7 +203,7 @@ GpuProcessTransportFactory::CreateSoftwareOutputDevice(
 #if defined(USE_AURA)
   if (shell::ShellIsRemote()) {
     return std::unique_ptr<cc::SoftwareOutputDevice>(
-        new SoftwareOutputDeviceMus(compositor));
+        new ui::SoftwareOutputDevice(compositor->window()));
   }
 #endif