Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

cc/test/skia_common.cc

 // Copyright 2012 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 "cc/test/skia_common.h"
 
 #include "cc/resources/picture.h"
 #include "skia/ext/refptr.h"
-#include "third_party/skia/include/core/SkDevice.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 TestPixelRef::TestPixelRef(int width, int height)
     : pixels_(new char[4 * width * height]) {}
 
 TestPixelRef::~TestPixelRef() {}
 
@@ skipping 38 matching lines @@
 }
 
 void DrawPicture(unsigned char* buffer,
                  gfx::Rect layer_rect,
                  scoped_refptr<Picture> picture) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                    layer_rect.width(),
                    layer_rect.height());
   bitmap.setPixels(buffer);
-  SkDevice device(bitmap);
+  SkBitmapDevice device(bitmap);
   SkCanvas canvas(&device);
   canvas.clipRect(gfx::RectToSkRect(layer_rect));
   picture->Raster(&canvas, NULL, layer_rect, 1.0f);
 }
 
 void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap) {
   skia::RefPtr<TestLazyPixelRef> lazy_pixel_ref =
       skia::AdoptRef(new TestLazyPixelRef(size.width(), size.height()));
   lazy_pixel_ref->setURI(uri);
 
   bitmap->setConfig(SkBitmap::kARGB_8888_Config,
                     size.width(),
                     size.height());
   bitmap->setPixelRef(lazy_pixel_ref.get());
 }
 
 
 }  // namespace cc