Revert "Dump DisplayListRasterSource memory"

cc/playback/raster_source.h

Index: cc/playback/raster_source.h
diff --git a/cc/playback/raster_source.h b/cc/playback/raster_source.h
index 4931ee531361d9210d2c62e0c86d6a1e392b6cf5..46d1a8522798ae5c4964880bfc145d724848ef1a 100644
--- a/cc/playback/raster_source.h
+++ b/cc/playback/raster_source.h
@@ -11,9 +11,6 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/threading/thread_checker.h"
-#include "base/trace_event/memory_allocator_dump.h"
-#include "base/trace_event/memory_dump_provider.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/playback/recording_source.h"
@@ -25,8 +22,7 @@ class DisplayItemList;
 class DrawImage;
 class ImageDecodeController;
 
-class CC_EXPORT RasterSource : public base::trace_event::MemoryDumpProvider,
-                               public base::RefCountedThreadSafe<RasterSource> {
+class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
  public:
   struct CC_EXPORT PlaybackSettings {
     PlaybackSettings();
@@ -120,16 +116,12 @@ class CC_EXPORT RasterSource : public base::trace_event::MemoryDumpProvider,
   // of the raster source, since the raster source will access it during raster.
   void SetImageDecodeController(ImageDecodeController* image_decode_controller);
 
-  // base::trace_event::MemoryDumpProvider implementation
-  bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
-                    base::trace_event::ProcessMemoryDump* pmd) override;
-
  protected:
   friend class base::RefCountedThreadSafe<RasterSource>;
 
   RasterSource(const RecordingSource* other, bool can_use_lcd_text);
   RasterSource(const RasterSource* other, bool can_use_lcd_text);
-  ~RasterSource() override;
+  virtual ~RasterSource();
 
   // These members are const as this raster source may be in use on another
   // thread and so should not be touched after construction.
@@ -164,9 +156,6 @@ class CC_EXPORT RasterSource : public base::trace_event::MemoryDumpProvider,
                                   const gfx::Rect& canvas_playback_rect,
                                   float contents_scale) const;
 
-  // Used to ensure that memory dump logic always happens on the same thread.
-  base::ThreadChecker memory_dump_thread_checker_;
-
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };