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

ui/message_center/message_center_impl_unittest.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 "ui/message_center/message_center_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 1067 matching lines @@
 
   // The notification should be in the queue.
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Now try setting the icon to a different size.
   gfx::Size new_size(16, 16);
   EXPECT_NE(original_size, new_size);
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(new_size.width(), new_size.height(), true);
-  sk_sp<SkSurface> surface = SkSurface::MakeRasterDirect(
-      bitmap.info(), bitmap.getPixels(), bitmap.rowBytes());
-  surface->getCanvas()->drawColor(SK_ColorBLUE);
+  SkCanvas canvas(bitmap);
+  canvas.drawColor(SK_ColorBLUE);
   gfx::Image test_image(
       gfx::Image(gfx::ImageSkia(gfx::ImageSkiaRep(bitmap, 1.f))));
   message_center()->SetNotificationIcon(id, test_image);
   message_center()->SetNotificationImage(id, test_image);
   message_center()->SetNotificationButtonIcon(id, 0, test_image);
   message_center()->SetNotificationButtonIcon(id, 1, test_image);
 
   // The notification should be in the queue.
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
@@ skipping 162 matching lines @@
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Then update a notification; the update should have propagated.
   message_center()->RemoveNotification(id, false);
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 }
 
 }  // namespace internal
 }  // namespace message_center