Revert of Revert "Revert of https://codereview.chromium.org/129423002/"

tests/MallocPixelRefTest.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 "SkData.h"
 #include "SkMallocPixelRef.h"
 #include "Test.h"
 #include "TestClassDef.h"
 
 static void delete_uint8_proc(void* ptr, void*) {
     delete[] static_cast<uint8_t*>(ptr);
 }
 
 static void set_to_one_proc(void*, void* context) {
     *(static_cast<int*>(context)) = 1;
 }
 
 /**
  *  This test contains basic sanity checks concerning SkMallocPixelRef.
  */
 DEF_TEST(MallocPixelRef, reporter) {
     REPORTER_ASSERT(reporter, true);
-    SkImageInfo info = SkImageInfo::MakeN32Premul(10, 13);
+    SkImageInfo info = {10, 13, kPMColor_SkColorType, kPremul_SkAlphaType};
     {
         SkAutoTUnref<SkMallocPixelRef> pr(
             SkMallocPixelRef::NewAllocate(info, info.minRowBytes() - 1, NULL));
         // rowbytes too small.
         REPORTER_ASSERT(reporter, NULL == pr.get());
     }
     {
         size_t rowBytes = info.minRowBytes() - 1;
         size_t size = info.getSafeSize(rowBytes);
         void* addr = sk_malloc_throw(size);
@@ skipping 69 matching lines @@
         REPORTER_ASSERT(reporter, dataPtr->unique());
         SkAutoTUnref<SkMallocPixelRef> pr(
             SkMallocPixelRef::NewWithData(info, rowBytes, NULL, data.get(), 4));
         REPORTER_ASSERT(reporter, !(dataPtr->unique()));
         data.reset(NULL);
         REPORTER_ASSERT(reporter, dataPtr->unique());
         REPORTER_ASSERT(reporter,
             static_cast<const void*>(dataPtr->bytes() + 4) == pr->pixels());
     }
 }