ui::ContextFactory should not create SurfaceIdAllocators

content/renderer/android/synchronous_compositor_output_surface.cc

Index: content/renderer/android/synchronous_compositor_output_surface.cc
diff --git a/content/renderer/android/synchronous_compositor_output_surface.cc b/content/renderer/android/synchronous_compositor_output_surface.cc
index a186f41fe1842dedff11e8ea81491acb48c1aa87..548826f92214371c975e3040040af19d6210e72c 100644
--- a/content/renderer/android/synchronous_compositor_output_surface.cc
+++ b/content/renderer/android/synchronous_compositor_output_surface.cc
@@ -106,10 +106,13 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
   capabilities_.delegated_rendering = true;
   memory_policy_.priority_cutoff_when_visible =
       gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE;
-  surface_id_allocator_->RegisterSurfaceClientId(surface_manager_.get());
+  surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
 }
 
-SynchronousCompositorOutputSurface::~SynchronousCompositorOutputSurface() {}
+SynchronousCompositorOutputSurface::~SynchronousCompositorOutputSurface() {
+  surface_manager_->InvalidateSurfaceClientId(
+      surface_id_allocator_->client_id());
+}
 
 void SynchronousCompositorOutputSurface::SetSyncClient(
     SynchronousCompositorOutputSurfaceClient* compositor) {