Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)"

This reverts commit eecaea4148805834f223681f70b6488ceba12d09.

R=robertphillips@google.com, scroggo@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14989 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
index fd98fca..00a1a3f 100644
--- a/tests/PipeTest.cpp
+++ b/tests/PipeTest.cpp
@@ -16,8 +16,7 @@
 // Ensures that the pipe gracefully handles drawing an invalid bitmap.
 static void testDrawingBadBitmap(SkCanvas* pipeCanvas) {
     SkBitmap badBitmap;
-    badBitmap.setConfig(SkImageInfo::Make(5, 5, kUnknown_SkColorType,
-                                          kPremul_SkAlphaType));
+    badBitmap.setInfo(SkImageInfo::MakeUnknown(5, 5));
     pipeCanvas->drawBitmap(badBitmap, 0, 0);
 }
 
@@ -44,7 +43,7 @@
 
 DEF_TEST(Pipe, reporter) {
     SkBitmap bitmap;
-    bitmap.setConfig(SkImageInfo::MakeN32Premul(64, 64));
+    bitmap.setInfo(SkImageInfo::MakeN32Premul(64, 64));
     SkCanvas canvas(bitmap);
 
     PipeController pipeController(&canvas);