replace setConfig+allocPixels with single call

tests/ImageCacheTest.cpp

  /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDiscardableMemory.h"
 #include "SkScaledImageCache.h"
 #include "Test.h"
 
 static void make_bm(SkBitmap* bm, int w, int h) {
-    bm->setConfig(SkBitmap::kARGB_8888_Config, w, h);
-    bm->allocPixels();
+    bm->allocN32Pixels(w, h);
 }
 
 static const int COUNT = 10;
 static const int DIM = 256;
 
 static void test_cache(skiatest::Reporter* reporter, SkScaledImageCache& cache,
                        bool testPurge) {
     SkScaledImageCache::ID* id;
 
     SkBitmap bm[COUNT];
@@ skipping 77 matching lines @@
         SkScaledImageCache cache(SkDiscardableMemory::Create);
         test_cache(reporter, cache, false);
     }
 }
 
 DEF_TEST(ImageCache_doubleAdd, r) {
     // Adding the same key twice should be safe.
     SkScaledImageCache cache(1024);
 
     SkBitmap original;
-    original.setConfig(SkBitmap::kARGB_8888_Config, 40, 40);
-    original.allocPixels();
+    original.allocN32Pixels(40, 40);
 
     SkBitmap scaled;
-    scaled.setConfig(SkBitmap::kARGB_8888_Config, 20, 20);
-    scaled.allocPixels();
+    scaled.allocN32Pixels(20, 20);
 
     SkScaledImageCache::ID* id1 = cache.addAndLock(original, 0.5f, 0.5f, scaled);
     SkScaledImageCache::ID* id2 = cache.addAndLock(original, 0.5f, 0.5f, scaled);
     // We don't really care if id1 == id2 as long as unlocking both works.
     cache.unlock(id1);
     cache.unlock(id2);
 }