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 38 matching lines @@
                   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());
+  surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
 }
 
-TestDelegatingOutputSurface::~TestDelegatingOutputSurface() {}
+TestDelegatingOutputSurface::~TestDelegatingOutputSurface() {
+  if (surface_manager_) {
+    surface_manager_->InvalidateSurfaceClientId(

[danakj, 2016/07/22 03:02:19]

Why is this here and not in DetachOutputSurface where
UnregisterSurfaceFactoryClient is? Is that intended? Are you aware this
currently runs on the main thread not the impl thread?

[Fady Samuel, 2016/07/22 12:23:38]

It should absolutely be next to UnregisterSurfaceFactoryClient given I want to
merge the two! Doh! Fixed. Thanks for catching this!

+        surface_id_allocator_->client_id());
+  }
+}
 
 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())
@@ skipping 82 matching lines @@
 void TestDelegatingOutputSurface::DisplayOutputSurfaceLost() {
   DidLoseOutputSurface();
 }
 
 void TestDelegatingOutputSurface::DisplaySetMemoryPolicy(
     const ManagedMemoryPolicy& policy) {
   SetMemoryPolicy(policy);
 }
 
 }  // namespace cc