services/ui: Split GpuServiceInternal into gpu vs. ws pieces.

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 c3d6c9831d6981e242c92464a779d3c192af5e89..00b296a9eaf960b1f3e5ffd115efceae97d957da 100644
--- a/services/ui/ws/frame_generator.h
+++ b/services/ui/ws/frame_generator.h
@@ -18,6 +18,10 @@ class CopyOutputRequest;
 class RenderPass;
 }
 
+namespace gpu {
+class GpuChannelHost;
+}
+
 namespace ui {
 
 class DisplayCompositor;
@@ -40,6 +44,8 @@ class FrameGenerator {
                  scoped_refptr<SurfacesState> surfaces_state);
   virtual ~FrameGenerator();
 
+  void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel);
+
   // Schedules a redraw for the provided region.
   void RequestRedraw(const gfx::Rect& redraw_region);
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget);
@@ -77,8 +83,10 @@ class FrameGenerator {
 
   FrameGeneratorDelegate* delegate_;
   scoped_refptr<SurfacesState> surfaces_state_;
+  scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
 
   std::unique_ptr<DisplayCompositor> display_compositor_;
+  gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
 
   // The region that needs to be redrawn next time the compositor frame is
   // generated.