Mus experiment in content shell on Android.

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 f608758e556e3f79980fd917e8e1ebe841f7a788..8139ab238002c1344511268a7a1d62e0aea20af9 100644
--- a/services/ui/ws/frame_generator.h
+++ b/services/ui/ws/frame_generator.h
@@ -14,6 +14,7 @@
 #include "cc/surfaces/local_frame_id.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "cc/surfaces/surface_sequence_generator.h"
+#include "gpu/ipc/common/surface_handle.h"
 #include "services/ui/ws/server_window_observer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
@@ -59,7 +60,7 @@ class FrameGenerator : public ServerWindowObserver {
 
   // Schedules a redraw for the provided region.
   void RequestRedraw(const gfx::Rect& redraw_region);
-  void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget);
+  void OnAcceleratedWidgetAvailable(gpu::SurfaceHandle widget);
   void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request);
 
@@ -121,7 +122,7 @@ class FrameGenerator : public ServerWindowObserver {
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
 
   std::unique_ptr<surfaces::CompositorFrameSink> compositor_frame_sink_;
-  gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
+  gpu::SurfaceHandle widget_ = gpu::kNullSurfaceHandle;
 
   // The region that needs to be redrawn next time the compositor frame is
   // generated.