Delete OnscreenDisplayClient and TopLevelDisplayClient.

cc/test/pixel_test_delegating_output_surface.h

Index: cc/test/pixel_test_delegating_output_surface.h
diff --git a/cc/test/pixel_test_delegating_output_surface.h b/cc/test/pixel_test_delegating_output_surface.h
index dd3d1786a6b3c86667ea07ff82843fce8c629529..873856865045852b0c77357f6ed58e9bc7b26313 100644
--- a/cc/test/pixel_test_delegating_output_surface.h
+++ b/cc/test/pixel_test_delegating_output_surface.h
@@ -41,20 +41,24 @@ class PixelTestDelegatingOutputSurface : public OutputSurface,
 
   // Allow tests to enlarge the backing texture for a non-root render pass, to
   // simulate reusing a larger texture from a previous frame for a new
-  // render pass.
+  // render pass. This should be called before the output surface is bound.
   void SetEnlargePassTextureAmount(const gfx::Size& amount);
 
  private:
   void DrawCallback(SurfaceDrawStatus);
 
   class PixelTestDisplayClient : public DisplayClient {
-    void OutputSurfaceLost() override {}
-    void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override {}
+    void DisplayOutputSurfaceLost() override {}
+    void DisplaySetMemoryPolicy(const ManagedMemoryPolicy& policy) override {}
   };
 
+  SharedBitmapManager* const shared_bitmap_manager_;
+  gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_;
   const bool allow_force_reclaim_resources_;
   const bool synchronous_composite_;
 
+  gfx::Size enlarge_pass_texture_amount_;
+
   std::unique_ptr<BackToBackBeginFrameSource> begin_frame_source_;
 
   // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface