cc: Delete the Renderer base class.

cc/output/software_renderer_unittest.cc

Index: cc/output/software_renderer_unittest.cc
diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc
index db86db3319c1860f2ebdbffeb248babf1f1f3eef..3b510df8c1a3ae6f5d52a722ff80226694acd518 100644
--- a/cc/output/software_renderer_unittest.cc
+++ b/cc/output/software_renderer_unittest.cc
@@ -31,7 +31,7 @@
 namespace cc {
 namespace {
 
-class SoftwareRendererTest : public testing::Test, public RendererClient {
+class SoftwareRendererTest : public testing::Test {
  public:
   void InitializeRenderer(
       std::unique_ptr<SoftwareOutputDevice> software_output_device) {
@@ -42,8 +42,9 @@ class SoftwareRendererTest : public testing::Test, public RendererClient {
     shared_bitmap_manager_.reset(new TestSharedBitmapManager());
     resource_provider_ = FakeResourceProvider::Create(
         output_surface_.get(), shared_bitmap_manager_.get());
-    renderer_ = SoftwareRenderer::Create(
-        this, &settings_, output_surface_.get(), resource_provider());
+    renderer_ =
+        SoftwareRenderer::Create(&renderer_client_, &settings_,
+                                 output_surface_.get(), resource_provider());
   }
 
   ResourceProvider* resource_provider() const {
@@ -52,9 +53,6 @@ class SoftwareRendererTest : public testing::Test, public RendererClient {
 
   SoftwareRenderer* renderer() const { return renderer_.get(); }
 
-  // RendererClient implementation.
-  void SetFullRootLayerDamage() override {}
-
   std::unique_ptr<SkBitmap> DrawAndCopyOutput(RenderPassList* list,
                                               float device_scale_factor,
                                               gfx::Rect device_viewport_rect) {
@@ -82,11 +80,17 @@ class SoftwareRendererTest : public testing::Test, public RendererClient {
   }
 
  protected:
+  class StubDirectRendererClient : public DirectRendererClient {
+   public:
+    void SetFullRootLayerDamage() override {}
+  };
+
   RendererSettings settings_;
   FakeOutputSurfaceClient output_surface_client_;
   std::unique_ptr<FakeOutputSurface> output_surface_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
   std::unique_ptr<ResourceProvider> resource_provider_;
+  StubDirectRendererClient renderer_client_;
   std::unique_ptr<SoftwareRenderer> renderer_;
 };