Remove duplicate typedef

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 <stdint.h>
 
 #include "base/memory/shared_memory.h"
 #include "build/build_config.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/blit.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/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_t values[h][w]) {
+void SetToCanvas(SkCanvas* canvas, uint8_t values[h][w]) {
   ASSERT_EQ(w, canvas->imageInfo().width());
   ASSERT_EQ(h, canvas->imageInfo().height());
 
   // This wouldn't be necessary if we extended the values in the inputs, but
   // the uint8_t values are a little bit easier to read and maintain.
   uint32_t extendedValues[w*h];
   for (int y = 0; y < h; y++) {
     for (int x = 0; x < w; x++) {
       uint8_t value = values[y][x];
       extendedValues[y*w+x] =
           (value << 24) | (value << 16) | (value << 8) | value;
     }
   }
 
   SkImageInfo info = SkImageInfo::MakeN32Premul(w, h);
   canvas->writePixels(info, extendedValues, w*4, 0, 0);
 }
 
 // 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_t values[h][w]) {
+void VerifyCanvasValues(SkCanvas* canvas, uint8_t values[h][w]) {
   SkBitmap bitmap = skia::ReadPixels(canvas);
   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_t value = values[y][x];
       uint32_t expected = (value << 24) | (value << 16) | (value << 8) | value;
       ASSERT_EQ(expected, *bitmap.getAddr32(x, y));
@@ skipping 107 matching lines @@
       {0x30, 0x31, 0x32, 0x33, 0x34},
       {0x40, 0x41, 0x42, 0x43, 0x44}};
   SetToCanvas<5, 5>(canvas.get(), initial_values);
 
   // Sanity check on input.
   VerifyCanvasValues<5, 5>(canvas.get(), initial_values);
 }
 
 #endif