Removal of dependencies on PlatformDevice classes.

skia/ext/vector_canvas_unittest.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
@@ skipping 81 matching lines @@
     EXPECT_TRUE(gfx::PNGCodec::Decode(
         reinterpret_cast<const unsigned char*>(compressed.data()),
         compressed.size(), &bitmap));
     SetSkBitmap(bitmap);
   }
 
   // Loads the image from a canvas.
   Image(const skia::PlatformCanvas& canvas) : ignore_alpha_(true) {
     // Use a different way to access the bitmap. The normal way would be to
     // query the SkBitmap.
-    HDC context = canvas.beginPlatformPaint();
+    HDC context = skia::BeginPlatformPaint(&canvas);
     HGDIOBJ bitmap = GetCurrentObject(context, OBJ_BITMAP);
     EXPECT_TRUE(bitmap != NULL);
     // Initialize the clip region to the entire bitmap.
     BITMAP bitmap_data;
     EXPECT_EQ(GetObject(bitmap, sizeof(BITMAP), &bitmap_data), sizeof(BITMAP));
     width_ = bitmap_data.bmWidth;
     height_ = bitmap_data.bmHeight;
     row_length_ = bitmap_data.bmWidthBytes;
     size_t size = row_length_ * height_;
     data_.resize(size);
     memcpy(&*data_.begin(), bitmap_data.bmBits, size);
-    canvas.endPlatformPaint();
+    skia::EndPlatformPaint(&canvas);
   }
 
   // Loads the image from a canvas.
   Image(const SkBitmap& bitmap) : ignore_alpha_(true) {
     SetSkBitmap(bitmap);
   }
 
   int width() const { return width_; }
   int height() const { return height_; }
   int row_length() const { return row_length_; }
@@ skipping 845 matching lines @@
   {
     vcanvas_->rotate(67);
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate")));
   }
 }
 
 }  // namespace skia