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

cc/surfaces/surface_display_output_surface.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 "cc/surfaces/surface_display_output_surface.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/surfaces/display.h"
@@ skipping 79 matching lines @@
     return false;
 
   // We want the Display's output surface to hear about lost context, and since
   // this shares a context with it, we should not be listening for lost context
   // callbacks on the context here.
   if (context_provider())
     context_provider()->SetLostContextCallback(base::Closure());
 
   // Avoid initializing GL context here, as this should be sharing the
   // Display's context.
-  display_->Initialize(this);
+  display_->Initialize(this, surface_manager_,
+                       surface_id_allocator_->client_id());
   return true;
 }
 
 void SurfaceDisplayOutputSurface::ForceReclaimResources() {
   if (!delegated_surface_id_.is_null()) {
     factory_.SubmitCompositorFrame(delegated_surface_id_, CompositorFrame(),
                                    SurfaceFactory::DrawCallback());
   }
 }
 
@@ skipping 44 matching lines @@
   SetMemoryPolicy(policy);
 }
 
 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) {
   // TODO(danakj): Why the lost check?
   if (!output_surface_lost_)
     client_->DidSwapBuffersComplete();
 }
 
 }  // namespace cc