Revert "Speculative revert by sheriff"

cc/test/fake_content_layer_client.h

 // Copyright 2012 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_TEST_FAKE_CONTENT_LAYER_CLIENT_H_
 #define CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 22 matching lines @@
     gfx::Transform transform;
     SkPaint paint;
   };
 
   FakeContentLayerClient();
   ~FakeContentLayerClient() override;
 
   void PaintContents(SkCanvas* canvas,
                      const gfx::Rect& rect,
                      PaintingControlSetting painting_control) override;
-  scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
+  void PaintContentsToDisplayList(
+      DisplayItemList* display_list,
       const gfx::Rect& clip,
       PaintingControlSetting painting_control) override;
   bool FillsBoundsCompletely() const override;
 
   void set_fill_with_nonsolid_color(bool nonsolid) {
     fill_with_nonsolid_color_ = nonsolid;
   }
 
   void add_draw_rect(const gfx::RectF& rect, const SkPaint& paint) {
     draw_rects_.push_back(std::make_pair(rect, paint));
@@ skipping 26 matching lines @@
   bool fill_with_nonsolid_color_;
   RectPaintVector draw_rects_;
   BitmapVector draw_bitmaps_;
   SkCanvas* last_canvas_;
   PaintingControlSetting last_painting_control_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_