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

services/ui/ws/frame_generator.cc

Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index 81a29c86ed22f6edaa367f59bbc197b52f26304d..46e864cb95e44c48f7a085265ab619904bfc529f 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -21,10 +21,8 @@
 namespace ws {
 
 FrameGenerator::FrameGenerator(FrameGeneratorDelegate* delegate,
-                               scoped_refptr<GpuState> gpu_state,
                                scoped_refptr<SurfacesState> surfaces_state)
     : delegate_(delegate),
-      gpu_state_(gpu_state),
       surfaces_state_(surfaces_state),
       draw_timer_(false, false),
       weak_factory_(this) {
@@ -46,9 +44,8 @@
 void FrameGenerator::OnAcceleratedWidgetAvailable(
     gfx::AcceleratedWidget widget) {
   if (widget != gfx::kNullAcceleratedWidget) {
-    display_compositor_.reset(
-        new DisplayCompositor(base::ThreadTaskRunnerHandle::Get(), widget,
-                              gpu_state_, surfaces_state_));
+    display_compositor_.reset(new DisplayCompositor(
+        base::ThreadTaskRunnerHandle::Get(), widget, surfaces_state_));
   }
 }