Revert 78812 - Unfork VectorPlatformCanvas.

skia/ext/vector_canvas_unittest.cc

 // Copyright (c) 2006-2008 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
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "skia/ext/vector_canvas.h"
-#include "skia/ext/vector_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace skia {
 
 namespace {
 
 const char kGenerateSwitch[] = "vector-canvas-generate";
 
@@ skipping 352 matching lines @@
     delete context_;
     context_ = NULL;
 
     parent::TearDown();
   }
 
   void Init(int size) {
     size_ = size;
     context_ = new Context();
     bitmap_ = new Bitmap(*context_, size_, size_);
-    vcanvas_ = new VectorCanvas(VectorPlatformDeviceFactory::CreateDevice(
-        size_, size_, true, context_->context()));
+    vcanvas_ = new VectorCanvas(context_->context(), size_, size_);
     pcanvas_ = new PlatformCanvas(size_, size_, false);
 
     // Clear white.
     vcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode);
     pcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode);
   }
 
   // Compares both canvas and returns the pixel difference in percentage between
   // both images. 0 on success and ]0, 100] on failure.
   double ProcessImage(const FilePath::StringType& filename) {
@@ skipping 45 matching lines @@
 
 TEST_F(VectorCanvasTest, Uninitialized) {
   // Do a little mubadumba do get uninitialized stuff.
   VectorCanvasTest::TearDown();
 
   // The goal is not to verify that have the same uninitialized data.
   compare_canvas_ = false;
 
   context_ = new Context();
   bitmap_ = new Bitmap(*context_, size_, size_);
-  vcanvas_ = new VectorCanvas(VectorPlatformDeviceFactory::CreateDevice(
-      size_, size_, true, context_->context()));
+  vcanvas_ = new VectorCanvas(context_->context(), size_, size_);
   pcanvas_ = new PlatformCanvas(size_, size_, false);
 
   // VectorCanvas default initialization is black.
   // PlatformCanvas default initialization is almost white 0x01FFFEFD (invalid
   // Skia color) in both Debug and Release. See magicTransparencyColor in
   // platform_device.cc
   EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("empty")));
 }
 
 TEST_F(VectorCanvasTest, BasicDrawing) {
@@ skipping 499 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