Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

cc/resources/bitmap_skpicture_content_layer_updater.cc

Index: cc/resources/bitmap_skpicture_content_layer_updater.cc
diff --git a/cc/resources/bitmap_skpicture_content_layer_updater.cc b/cc/resources/bitmap_skpicture_content_layer_updater.cc
index 2c00099de1c8ec8da52803e63b9d9944a211c716..2db3f417a97ae0f1344b610f479b76bbce701ef1 100644
--- a/cc/resources/bitmap_skpicture_content_layer_updater.cc
+++ b/cc/resources/bitmap_skpicture_content_layer_updater.cc
@@ -9,8 +9,8 @@
 #include "cc/resources/layer_painter.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_update_queue.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
 
 namespace cc {
 
@@ -28,7 +28,7 @@ void BitmapSkPictureContentLayerUpdater::Resource::Update(
       SkBitmap::kARGB_8888_Config, source_rect.width(), source_rect.height());
   bitmap_.allocPixels();
   bitmap_.setIsOpaque(updater_->layer_is_opaque());
-  SkDevice device(bitmap_);
+  SkBitmapDevice device(bitmap_);
   SkCanvas canvas(&device);
   updater_->PaintContentsRect(&canvas, source_rect);