Removal of dependencies on PlatformDevice classes.

ui/gfx/blit_unittest.cc

 // Copyright (c) 2010 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.
 
 #include "base/basictypes.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/blit.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
 // Fills the given canvas with the values by duplicating the values into each
 // color channel for the corresponding pixel.
 //
 // Example values = {{0x0, 0x01}, {0x12, 0xFF}} would give a canvas with:
 //   0x00000000 0x01010101
 //   0x12121212 0xFFFFFFFF
 template<int w, int h>
 void SetToCanvas(skia::PlatformCanvas* canvas, uint8 values[h][w]) {
   SkBitmap& bitmap = const_cast<SkBitmap&>(
-      canvas->getTopPlatformDevice().accessBitmap(true));
+      skia::GetTopDevice(*canvas)->accessBitmap(true));
   SkAutoLockPixels lock(bitmap);
   ASSERT_EQ(w, bitmap.width());
   ASSERT_EQ(h, bitmap.height());
 
   for (int y = 0; y < h; y++) {
     for (int x = 0; x < w; x++) {
       uint8 value = values[y][x];
       *bitmap.getAddr32(x, y) =
           (value << 24) | (value << 16) | (value << 8) | value;
     }
   }
 }
 
 // Checks each pixel in the given canvas and see if it is made up of the given
 // values, where each value has been duplicated into each channel of the given
 // bitmap (see SetToCanvas above).
 template<int w, int h>
 void VerifyCanvasValues(skia::PlatformCanvas* canvas, uint8 values[h][w]) {
   SkBitmap& bitmap = const_cast<SkBitmap&>(
-      canvas->getTopPlatformDevice().accessBitmap(true));
+      skia::GetTopDevice(*canvas)->accessBitmap(true));
   SkAutoLockPixels lock(bitmap);
   ASSERT_EQ(w, bitmap.width());
   ASSERT_EQ(h, bitmap.height());
 
   for (int y = 0; y < h; y++) {
     for (int x = 0; x < w; x++) {
       uint8 value = values[y][x];
       uint32 expected =
           (value << 24) | (value << 16) | (value << 8) | value;
       ASSERT_EQ(expected, *bitmap.getAddr32(x, y));
@@ skipping 72 matching lines @@
   SetToCanvas<5, 5>(&canvas, initial_values);
   gfx::ScrollCanvas(&canvas, center_three, gfx::Point(2, 2));
   uint8 scroll_diagonal_expected[kCanvasHeight][kCanvasWidth] = {
       { 0x00, 0x01, 0x02, 0x03, 0x04 },
       { 0x10, 0x11, 0x12, 0x13, 0x14 },
       { 0x20, 0x21, 0x22, 0x23, 0x24 },
       { 0x30, 0x31, 0x32, 0x11, 0x34 },
       { 0x40, 0x41, 0x42, 0x43, 0x44 }};
   VerifyCanvasValues<5, 5>(&canvas, scroll_diagonal_expected);
 }