Mus experiment in content shell on Android.

services/ui/surfaces/surfaces_context_provider.cc

Index: services/ui/surfaces/surfaces_context_provider.cc
diff --git a/services/ui/surfaces/surfaces_context_provider.cc b/services/ui/surfaces/surfaces_context_provider.cc
index 2eda8f167e553da16b7760fdeaebfca389940bc0..8960274927c3da5b01968978715cc1faaf832c1d 100644
--- a/services/ui/surfaces/surfaces_context_provider.cc
+++ b/services/ui/surfaces/surfaces_context_provider.cc
@@ -20,6 +20,7 @@
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
+#include "gpu/ipc/common/gpu_surface_tracker.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/surfaces/surfaces_context_provider_delegate.h"
 #include "ui/gl/gpu_preference.h"
@@ -45,8 +46,17 @@ SurfacesContextProvider::SurfacesContextProvider(
   attributes.bind_generates_resource = false;
   attributes.lose_context_when_out_of_memory = true;
   GURL active_url;
+
+  gpu::SurfaceHandle surface_handle;
+#if defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW)
+  surface_handle = widget;
+#else
+  surface_handle =
+      gpu::GpuSurfaceTracker::Get()->AddSurfaceForNativeWidget(widget);
+#endif
+
   command_buffer_proxy_impl_ = gpu::CommandBufferProxyImpl::Create(
-      std::move(gpu_channel), widget, shared_command_buffer, stream_id,
+      std::move(gpu_channel), surface_handle, shared_command_buffer, stream_id,
       stream_priority, attributes, active_url, task_runner_);
   CHECK(command_buffer_proxy_impl_);
   command_buffer_proxy_impl_->SetSwapBuffersCompletionCallback(