Revert of cc: Make LayerTreeTests use a DelegatingRenderer and Display.

cc/surfaces/display.h

 // 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.
 
 #ifndef CC_SURFACES_DISPLAY_H_
 #define CC_SURFACES_DISPLAY_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 97 matching lines @@
 
   // SurfaceDamageObserver implementation.
   void OnSurfaceDamaged(const SurfaceId& surface, bool* changed) override;
 
   void SetEnlargePassTextureAmountForTesting(
       const gfx::Size& enlarge_texture_amount) {
     enlarge_texture_amount_ = enlarge_texture_amount;
   }
 
   bool has_scheduler() const { return !!scheduler_; }
-  DirectRenderer* renderer_for_testing() const { return renderer_.get(); }
 
  private:
   void InitializeRenderer();
   void UpdateRootSurfaceResourcesLocked();
 
   SharedBitmapManager* const bitmap_manager_;
   gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_;
   const RendererSettings settings_;
 
-  DisplayClient* client_ = nullptr;
-  SurfaceManager* surface_manager_ = nullptr;
+  DisplayClient* client_;
+  SurfaceManager* surface_manager_;
   uint32_t compositor_surface_namespace_;
   SurfaceId current_surface_id_;
   gfx::Size current_surface_size_;
   float device_scale_factor_ = 1.f;
   gfx::ColorSpace device_color_space_;
   bool swapped_since_resize_ = false;
   gfx::Rect external_clip_;
   gfx::Rect external_viewport_;
   gfx::Size enlarge_texture_amount_;
   bool output_is_secure_ = false;
@@ skipping 10 matching lines @@
   SoftwareRenderer* software_renderer_ = nullptr;
   std::vector<ui::LatencyInfo> stored_latency_info_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_DISPLAY_H_