Move PlatformCanvas and PlatformDevice from base/gfx to webkit/port. I left h...

webkit/port/platform/graphics/skia/public/VectorCanvas_unittest.cpp

 // 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 "base/gfx/vector_canvas.h"
+#include "VectorCanvas.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/path_service.h"
@@ skipping 332 matching lines @@
                   compressed.size()));
   EXPECT_TRUE(PNGDecoder::Decode(&data, bitmap));
   EXPECT_FALSE(bitmap->isOpaque());
   Premultiply(*bitmap);
 }
 
 }  // namespace
 
 // Streams an image.
 inline std::ostream& operator<<(std::ostream& out, const Image& image) {
-  return out << "Image(" << image.size() << ", " << image.row_length() << ")";
+  return out << "Image(" << image.size().width() << ", "
+             << image.size().height() << ", " << image.row_length() << ")";
 }
 
 // Runs simultaneously the same drawing commands on VectorCanvas and
 // PlatformCanvas and compare the results.
 class VectorCanvasTest : public ImageTest {
  public:
   typedef ImageTest parent;
 
   VectorCanvasTest() : parent(L"base", CurrentMode()), compare_canvas_(true) {
   }
@@ skipping 630 matching lines @@
 
   {
     vcanvas_->rotate(67);
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(L"rotate"));
   }
 }