Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

cc/trees/layer_tree_host_pixeltest_readback.cc

 // Copyright 2013 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"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
@@ skipping 834 matching lines @@
 TEST_F(LayerTreeHostReadbackPixelTest,
        ReadbackNonRootTextureLayerOutsideViewport) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);
 
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
   bitmap.allocPixels();
   bitmap.eraseColor(SK_ColorGREEN);
   {
-    SkDevice device(bitmap);
+    SkBitmapDevice device(bitmap);
     skia::RefPtr<SkCanvas> canvas = skia::AdoptRef(new SkCanvas(&device));
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(SK_ColorBLUE);
     canvas->drawRect(SkRect::MakeXYWH(150, 150, 50, 50), paint);
   }
 
   scoped_refptr<TextureLayer> texture = CreateTextureLayer(
       gfx::Rect(200, 200), bitmap);
 
@@ skipping 11 matching lines @@
                                  background,
                                  texture.get(),
                                  base::FilePath(FILE_PATH_LITERAL(
                                      "green_with_blue_corner.png")));
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // OS_ANDROID