Index: content/browser/media/capture/web_contents_video_capture_device_unittest.cc |
diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc |
index 4f3fb0a325b84da1505857a55f6b7f87319ad9b5..705df7071e2ddb4e2f97b2ca523b20568024ad81 100644 |
--- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc |
+++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc |
@@ -273,15 +273,13 @@ class CaptureTestRenderViewHost : public TestRenderViewHost { |
gfx::Size size = controller_->GetCopyResultSize(); |
SkColor color = controller_->GetSolidColor(); |
- // Although it's not necessary, use a PlatformBitmap here (instead of a |
- // regular SkBitmap) to exercise possible threading issues. |
- skia::PlatformBitmap output; |
- EXPECT_TRUE(output.Allocate(size.width(), size.height(), false)); |
+ SkBitmap output; |
+ EXPECT_TRUE(output.tryAllocN32Pixels(size.width(), size.height())); |
{ |
- SkAutoLockPixels locker(output.GetBitmap()); |
- output.GetBitmap().eraseColor(color); |
+ SkAutoLockPixels locker(output); |
+ output.eraseColor(color); |
} |
- callback.Run(output.GetBitmap(), content::READBACK_SUCCESS); |
+ callback.Run(output, content::READBACK_SUCCESS); |
controller_->SignalCopy(); |
} |