| Index: tests/PipeTest.cpp
 | 
| diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
 | 
| index 00a1a3f201b39195199fbff329e6e1d70d3894f8..fd98fca7ef8afe3251b45392cf7a83ac268a153c 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.setInfo(SkImageInfo::MakeUnknown(5, 5));
 | 
| +    badBitmap.setConfig(SkImageInfo::Make(5, 5, kUnknown_SkColorType,
 | 
| +                                          kPremul_SkAlphaType));
 | 
|      pipeCanvas->drawBitmap(badBitmap, 0, 0);
 | 
|  }
 | 
|  
 | 
| @@ -43,7 +44,7 @@
 | 
|  
 | 
|  DEF_TEST(Pipe, reporter) {
 | 
|      SkBitmap bitmap;
 | 
| -    bitmap.setInfo(SkImageInfo::MakeN32Premul(64, 64));
 | 
| +    bitmap.setConfig(SkImageInfo::MakeN32Premul(64, 64));
 | 
|      SkCanvas canvas(bitmap);
 | 
|  
 | 
|      PipeController pipeController(&canvas);
 | 
| 
 |