Use SkCanvas::SkCanvas(SkBitmap) instead of going thru SkSurface

ash/common/accelerators/debug_commands.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 "ash/common/accelerators/debug_commands.h"
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/toast/toast_data.h"
@@ skipping 75 matching lines @@
     LOG(ERROR) << out.str();
   }
 }
 
 gfx::ImageSkia CreateWallpaperImage(SkColor fill, SkColor rect) {
   // TODO(oshima): Consider adding a command line option to control wallpaper
   // images for testing. The size is randomly picked.
   gfx::Size image_size(1366, 768);
   SkBitmap bitmap;
   bitmap.allocN32Pixels(image_size.width(), image_size.height(), true);
-  sk_sp<SkSurface> surface = SkSurface::MakeRasterDirect(
-      bitmap.info(), bitmap.getPixels(), bitmap.rowBytes());
-  surface->getCanvas()->drawColor(fill);
+  SkCanvas canvas(bitmap);
+  canvas.drawColor(fill);
   SkPaint paint;
   paint.setColor(rect);
   paint.setStrokeWidth(10);
   paint.setStyle(SkPaint::kStroke_Style);
   paint.setBlendMode(SkBlendMode::kSrcOver);
-  surface->getCanvas()->drawRoundRect(gfx::RectToSkRect(gfx::Rect(image_size)),
-                                      100.f, 100.f, paint);
+  canvas.drawRoundRect(gfx::RectToSkRect(gfx::Rect(image_size)), 100.f, 100.f,
+                       paint);
   return gfx::ImageSkia(gfx::ImageSkiaRep(std::move(bitmap), 1.f));
 }
 
 void HandleToggleWallpaperMode() {
   static int index = 0;
   WallpaperController* wallpaper_controller =
       Shell::GetInstance()->wallpaper_controller();
   switch (++index % 4) {
     case 0:
       Shell::Get()->wallpaper_delegate()->InitializeWallpaper();
@@ skipping 95 matching lines @@
     case DEBUG_TRIGGER_CRASH:
       HandleTriggerCrash();
       break;
     default:
       break;
   }
 }
 
 }  // namespace debug
 }  // namespace ash