Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready.



git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 2e4642e..daadc86 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -19,20 +19,17 @@
 
 namespace {
 
-class FakeDevice : public SkBitmapDevice {
+class FakeDevice : public SkDevice {
 public:
-    FakeDevice() : SkBitmapDevice(SkBitmap::kARGB_8888_Config, 100, 100, false) { }
+    FakeDevice() : SkDevice(SkBitmap::kARGB_8888_Config, 100, 100) { }
 
     virtual void drawRect(const SkDraw& draw, const SkRect& r,
                           const SkPaint& paint) SK_OVERRIDE {
         fLastMatrix = *draw.fMatrix;
-        INHERITED::drawRect(draw, r, paint);
+        SkDevice::drawRect(draw, r, paint);
     }
 
     SkMatrix fLastMatrix;
-
-private:
-    typedef SkBitmapDevice INHERITED;
 };
 
 } // namespace