replace setConfig+allocPixels with single call

BUG=skia:

Review URL: https://codereview.chromium.org/162643002

git-svn-id: http://skia.googlecode.com/svn/trunk@13426 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
index 6ab4d8eb4b..fd98fca7ef 100644
--- a/tests/PipeTest.cpp
+++ b/tests/PipeTest.cpp
@@ -16,7 +16,8 @@
 // Ensures that the pipe gracefully handles drawing an invalid bitmap.
 static void testDrawingBadBitmap(SkCanvas* pipeCanvas) {
     SkBitmap badBitmap;
-    badBitmap.setConfig(SkBitmap::kNo_Config, 5, 5);
+    badBitmap.setConfig(SkImageInfo::Make(5, 5, kUnknown_SkColorType,
+                                          kPremul_SkAlphaType));
     pipeCanvas->drawBitmap(badBitmap, 0, 0);
 }
 
@@ -29,8 +30,7 @@ static void testDrawingAfterEndRecording(SkCanvas* canvas) {
     writer.endRecording();
 
     SkBitmap bm;
-    bm.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
-    bm.allocPixels();
+    bm.allocN32Pixels(2, 2);
     bm.eraseColor(SK_ColorTRANSPARENT);
 
     SkShader* shader = SkShader::CreateBitmapShader(bm, SkShader::kClamp_TileMode,
@@ -44,7 +44,7 @@ static void testDrawingAfterEndRecording(SkCanvas* canvas) {
 
 DEF_TEST(Pipe, reporter) {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 64, 64);
+    bitmap.setConfig(SkImageInfo::MakeN32Premul(64, 64));
     SkCanvas canvas(bitmap);
 
     PipeController pipeController(&canvas);