Revert 86625 - This change implements a first pass in the effort to remove the dependency of Plat...

ui/gfx/blit_unittest.cc

Index: ui/gfx/blit_unittest.cc
===================================================================
--- ui/gfx/blit_unittest.cc	(revision 86628)
+++ ui/gfx/blit_unittest.cc	(working copy)
@@ -20,7 +20,7 @@
 template<int w, int h>
 void SetToCanvas(skia::PlatformCanvas* canvas, uint8 values[h][w]) {
   SkBitmap& bitmap = const_cast<SkBitmap&>(
-      skia::GetTopDevice(*canvas)->accessBitmap(true));
+      canvas->getTopPlatformDevice().accessBitmap(true));
   SkAutoLockPixels lock(bitmap);
   ASSERT_EQ(w, bitmap.width());
   ASSERT_EQ(h, bitmap.height());
@@ -40,7 +40,7 @@
 template<int w, int h>
 void VerifyCanvasValues(skia::PlatformCanvas* canvas, uint8 values[h][w]) {
   SkBitmap& bitmap = const_cast<SkBitmap&>(
-      skia::GetTopDevice(*canvas)->accessBitmap(true));
+      canvas->getTopPlatformDevice().accessBitmap(true));
   SkAutoLockPixels lock(bitmap);
   ASSERT_EQ(w, bitmap.width());
   ASSERT_EQ(h, bitmap.height());