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

services/ui/ws/frame_generator.h

Index: services/ui/ws/frame_generator.h
diff --git a/services/ui/ws/frame_generator.h b/services/ui/ws/frame_generator.h
index 870fb5a0f20a18515930ed5897fe8517e0b15533..55da0ce88e1b89799dd0c72c58fb3f07985eeac9 100644
--- a/services/ui/ws/frame_generator.h
+++ b/services/ui/ws/frame_generator.h
@@ -21,7 +21,6 @@
 namespace ui {
 
 class DisplayCompositor;
-class GpuState;
 class SurfacesState;
 
 namespace ws {
@@ -38,7 +37,6 @@
 class FrameGenerator {
  public:
   FrameGenerator(FrameGeneratorDelegate* delegate,
-                 scoped_refptr<GpuState> gpu_state,
                  scoped_refptr<SurfacesState> surfaces_state);
   virtual ~FrameGenerator();
 
@@ -76,7 +74,6 @@
                       float opacity);
 
   FrameGeneratorDelegate* delegate_;
-  scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<SurfacesState> surfaces_state_;
 
   std::unique_ptr<DisplayCompositor> display_compositor_;