cc: Allow TestDelegatingOutputSurface to be used for non-pixel tests.

services/ui/surfaces/display_compositor.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 "services/ui/surfaces/display_compositor.h"
 
 #include "cc/output/copy_output_request.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 49 matching lines @@
 
   int max_frames_pending =
       display_output_surface->capabilities().max_frames_pending;
   DCHECK_GT(max_frames_pending, 0);
 
   std::unique_ptr<cc::DisplayScheduler> scheduler(
       new cc::DisplayScheduler(synthetic_begin_frame_source.get(),
                                task_runner_.get(), max_frames_pending));
 
   display_.reset(new cc::Display(
-      surfaces_state_->manager(), nullptr /* bitmap_manager */,
-      nullptr /* gpu_memory_buffer_manager */, cc::RendererSettings(),
-      allocator_.client_id(), std::move(synthetic_begin_frame_source),
+      nullptr /* bitmap_manager */, nullptr /* gpu_memory_buffer_manager */,
+      cc::RendererSettings(), std::move(synthetic_begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get())));
-  display_->Initialize(this);
+  display_->Initialize(this, surfaces_state_->manager(),
+                       allocator_.client_id());
 }
 
 DisplayCompositor::~DisplayCompositor() {
   surfaces_state_->manager()->UnregisterSurfaceFactoryClient(
       allocator_.client_id());
 }
 
 void DisplayCompositor::SubmitCompositorFrame(
     cc::CompositorFrame frame,
     const base::Callback<void(cc::SurfaceDrawStatus)>& callback) {
@@ skipping 29 matching lines @@
 void DisplayCompositor::DisplayOutputSurfaceLost() {
   // TODO(fsamuel): This looks like it would crash if a frame was in flight and
   // will be submitted.
   display_.reset();
 }
 
 void DisplayCompositor::DisplaySetMemoryPolicy(
     const cc::ManagedMemoryPolicy& policy) {}
 
 }  // namespace ui