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..f07e03af7bcc2aa7c9d8858f9cf157b67041d9dd 100644
--- a/content/renderer/android/synchronous_compositor_output_surface.cc
+++ b/content/renderer/android/synchronous_compositor_output_surface.cc
@@ -106,7 +106,6 @@ 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());
 }
 
 SynchronousCompositorOutputSurface::~SynchronousCompositorOutputSurface() {}

[danakj, 2016/07/22 19:01:59]

nit: = default

[Fady Samuel, 2016/07/22 19:08:40]

Done.

@@ -143,6 +142,7 @@ bool SynchronousCompositorOutputSurface::BindToClient(
   registry_->RegisterOutputSurface(routing_id_, this);
   registered_ = true;
 
+  surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
   surface_manager_->RegisterSurfaceFactoryClient(
       surface_id_allocator_->client_id(), this);
 
@@ -174,6 +174,8 @@ void SynchronousCompositorOutputSurface::DetachFromClient() {
     surface_factory_->Destroy(delegated_surface_id_);
   surface_manager_->UnregisterSurfaceFactoryClient(
       surface_id_allocator_->client_id());
+  surface_manager_->InvalidateSurfaceClientId(
+      surface_id_allocator_->client_id());
   display_ = nullptr;
   surface_factory_ = nullptr;
   surface_id_allocator_ = nullptr;