Revert of services/ui: Revert CLs that broke Windows.

ui/views/mus/surface_context_factory.h

Index: ui/views/mus/surface_context_factory.h
diff --git a/ui/views/mus/surface_context_factory.h b/ui/views/mus/surface_context_factory.h
index 69afdd6e8b6623c9f91f3b1f98c265201db6e0a7..d5ead5dd9514bfcc10d5fa842c2d53138b87c6d4 100644
--- a/ui/views/mus/surface_context_factory.h
+++ b/ui/views/mus/surface_context_factory.h
@@ -9,15 +9,11 @@
 
 #include "base/macros.h"
 #include "services/ui/common/mojo_gpu_memory_buffer_manager.h"
-#include "services/ui/gles2/raster_thread_helper.h"
+#include "services/ui/public/cpp/raster_thread_helper.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/compositor/compositor.h"
 #include "ui/views/mus/mus_export.h"
 #include "ui/views/mus/surface_binding.h"
-
-namespace mojo {
-class Connector;
-}
 
 namespace ui {
 class Window;
@@ -27,8 +23,7 @@
 
 class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory {
  public:
-  SurfaceContextFactory(shell::Connector* connector,
-                        ui::Window* window,
+  SurfaceContextFactory(ui::Window* window,
                         ui::mojom::SurfaceType surface_type);
   ~SurfaceContextFactory() override;
 
@@ -64,7 +59,7 @@
 
   SurfaceBinding surface_binding_;
   uint32_t next_surface_id_namespace_;
-  gles2::RasterThreadHelper raster_thread_helper_;
+  ui::RasterThreadHelper raster_thread_helper_;
   ui::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory);