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

cc/surfaces/surface_display_output_surface_unittest.cc

 // Copyright 2015 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/surfaces/surface_display_output_surface.h"
 
 #include <memory>
 
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 33 matching lines @@
 
     std::unique_ptr<BeginFrameSource> begin_frame_source(
         new BackToBackBeginFrameSource(
             base::MakeUnique<DelayBasedTimeSource>(task_runner_.get())));
 
     int max_frames_pending = 2;
     std::unique_ptr<DisplayScheduler> scheduler(new DisplayScheduler(
         begin_frame_source.get(), task_runner_.get(), max_frames_pending));
 
     display_.reset(new Display(
-        &surface_manager_, &bitmap_manager_, &gpu_memory_buffer_manager_,
-        RendererSettings(), allocator_.client_id(),
+        &bitmap_manager_, &gpu_memory_buffer_manager_, RendererSettings(),
         std::move(begin_frame_source), std::move(display_output_surface),
         std::move(scheduler),
         base::MakeUnique<TextureMailboxDeleter>(task_runner_.get())));
     delegated_output_surface_.reset(new SurfaceDisplayOutputSurface(
         &surface_manager_, &allocator_, display_.get(), context_provider_,
         nullptr));
 
     delegated_output_surface_->BindToClient(&delegated_output_surface_client_);
     display_->Resize(display_size_);
 
@@ skipping 81 matching lines @@
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 
   SwapBuffersWithDamage(gfx::Rect());
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 }
 
 }  // namespace
 }  // namespace cc