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

ui/views/mus/surface_context_factory.h

 // 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.
 
 #ifndef UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_
 #define UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_
 
 #include <stdint.h>
 
 #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;
 }
 
 namespace views {
 
 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;
 
  private:
   // ContextFactory:
   void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override;
   std::unique_ptr<ui::Reflector> CreateReflector(
       ui::Compositor* mirrored_compositor,
       ui::Layer* mirroring_layer) override;
   void RemoveReflector(ui::Reflector* reflector) override;
@@ skipping 15 matching lines @@
                                      base::TimeDelta interval) override {}
   void SetDisplayVSyncParameters(ui::Compositor* compositor,
                                  base::TimeTicks timebase,
                                  base::TimeDelta interval) override {}
   void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override {}
   void AddObserver(ui::ContextFactoryObserver* observer) override {}
   void RemoveObserver(ui::ContextFactoryObserver* observer) override {}
 
   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);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_