cc: Gather and lock/unlock SkDiscardablePixelRefs instead of skia::LazyPixelRefs.

cc/test/skia_common.h

Index: cc/test/skia_common.h
diff --git a/cc/test/skia_common.h b/cc/test/skia_common.h
index 8762f3253089d2cb3b5516bca3a864083f9155f7..853fb5da78243a3e49be94a4176a7eb6b9aaeed6 100644
--- a/cc/test/skia_common.h
+++ b/cc/test/skia_common.h
@@ -7,9 +7,9 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "skia/ext/lazy_pixel_ref.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkFlattenable.h"
+#include "third_party/skia/include/core/SkPixelRef.h"
 
 namespace gfx {
 class Rect;
@@ -34,24 +34,6 @@ class TestPixelRef : public SkPixelRef {
   scoped_ptr<char[]> pixels_;
 };
 
-class TestLazyPixelRef : public skia::LazyPixelRef {
- public:
-  explicit TestLazyPixelRef(const SkImageInfo& info);
-  virtual ~TestLazyPixelRef();
-
-  virtual SkFlattenable::Factory getFactory() const OVERRIDE;
-  virtual void* onLockPixels(SkColorTable** color_table) OVERRIDE;
-  virtual void onUnlockPixels() OVERRIDE {}
-  virtual bool PrepareToDecode(const PrepareParams& params) OVERRIDE;
-  virtual bool MaybeDecoded() OVERRIDE;
-  virtual SkPixelRef* deepCopy(
-      SkBitmap::Config config,
-      const SkIRect* subset) OVERRIDE;
-  virtual void Decode() OVERRIDE {}
- private:
-  scoped_ptr<char[]> pixels_;
-};
-
 void DrawPicture(unsigned char* buffer,
                  gfx::Rect layer_rect,
                  scoped_refptr<Picture> picture);