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

ui/compositor/test/in_process_context_factory.cc

 // Copyright 2014 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 "ui/compositor/test/in_process_context_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 158 matching lines @@
 
   if (surface_manager_) {
     std::unique_ptr<cc::DelayBasedBeginFrameSource> begin_frame_source(
         new cc::DelayBasedBeginFrameSource(
             base::MakeUnique<cc::DelayBasedTimeSource>(
                 compositor->task_runner().get())));
     std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
         begin_frame_source.get(), compositor->task_runner().get(),
         display_output_surface->capabilities().max_frames_pending));
     per_compositor_data_[compositor.get()] = base::MakeUnique<cc::Display>(
-        surface_manager_, GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
-        compositor->GetRendererSettings(),
-        compositor->surface_id_allocator()->client_id(),
-        std::move(begin_frame_source), std::move(display_output_surface),
-        std::move(scheduler), base::MakeUnique<cc::TextureMailboxDeleter>(
-                                  compositor->task_runner().get()));
+        GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
+        compositor->GetRendererSettings(), std::move(begin_frame_source),
+        std::move(display_output_surface), std::move(scheduler),
+        base::MakeUnique<cc::TextureMailboxDeleter>(
+            compositor->task_runner().get()));
 
     auto* display = per_compositor_data_[compositor.get()].get();
     std::unique_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
         new cc::SurfaceDisplayOutputSurface(
             surface_manager_, compositor->surface_id_allocator(), display,
             context_provider, shared_worker_context_provider_));
     compositor->SetOutputSurface(std::move(surface_output_surface));
   } else {
     compositor->SetOutputSurface(std::move(display_output_surface));
   }
@@ skipping 75 matching lines @@
 
 void InProcessContextFactory::AddObserver(ContextFactoryObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void InProcessContextFactory::RemoveObserver(ContextFactoryObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 }  // namespace ui