ui::ContextFactory should not create SurfaceIdAllocators

cc/test/test_delegating_output_surface.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/test_delegating_output_surface.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "cc/output/begin_frame_args.h"
@@ skipping 37 matching lines @@
                   std::move(display_output_surface), std::move(scheduler),
                   base::MakeUnique<TextureMailboxDeleter>(task_runner)));
 
   capabilities_.delegated_rendering = true;
   // Since this OutputSurface and the Display are tightly coupled and in the
   // same process/thread, the LayerTreeHostImpl can reclaim resources from
   // the Display.
   capabilities_.can_force_reclaim_resources = true;
   capabilities_.delegated_sync_points_required =
       !context_shared_with_compositor;
-
-  surface_id_allocator_->RegisterSurfaceClientId(surface_manager_.get());
 }
 
 TestDelegatingOutputSurface::~TestDelegatingOutputSurface() {}
 
 bool TestDelegatingOutputSurface::BindToClient(OutputSurfaceClient* client) {
   if (!OutputSurface::BindToClient(client))
     return false;
 
   // We want the Display's output surface to hear about lost context, and since
   // this shares a context with it (when delegated_sync_points_required is
   // false), we should not be listening for lost context callbacks on the
   // context here.
   if (!capabilities_.delegated_sync_points_required && context_provider())
     context_provider()->SetLostContextCallback(base::Closure());
 
+  surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
   surface_manager_->RegisterSurfaceFactoryClient(
       surface_id_allocator_->client_id(), this);
   display_->Initialize(this, surface_manager_.get(),
                        surface_id_allocator_->client_id());
   bound_ = true;
   return true;
 }
 
 void TestDelegatingOutputSurface::DetachFromClient() {
   // Some tests make BindToClient fail on purpose. ^__^
   if (bound_) {
     if (!delegated_surface_id_.is_null())
       surface_factory_->Destroy(delegated_surface_id_);
     surface_manager_->UnregisterSurfaceFactoryClient(
         surface_id_allocator_->client_id());
+    surface_manager_->InvalidateSurfaceClientId(
+        surface_id_allocator_->client_id());
     bound_ = false;
   }
   display_ = nullptr;
   surface_factory_ = nullptr;
   surface_id_allocator_ = nullptr;
   surface_manager_ = nullptr;
   weak_ptrs_.InvalidateWeakPtrs();
   OutputSurface::DetachFromClient();
 }
 
@@ skipping 55 matching lines @@
 void TestDelegatingOutputSurface::DisplayOutputSurfaceLost() {
   DidLoseOutputSurface();
 }
 
 void TestDelegatingOutputSurface::DisplaySetMemoryPolicy(
     const ManagedMemoryPolicy& policy) {
   SetMemoryPolicy(policy);
 }
 
 }  // namespace cc