SkImageInfo will soon have a constructor, so can't init it with {} anymore

chrome/browser/android/thumbnail/thumbnail_store.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/thumbnail/thumbnail_store.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/big_endian.h"
@@ skipping 546 matching lines @@
   gfx::Size content_size;
 
   if (!raw_data.empty()) {
     SkAutoLockPixels raw_data_lock(raw_data);
     gfx::Size raw_data_size(raw_data.width(), raw_data.height());
     size_t pixel_size = 4;  // Pixel size is 4 bytes for kARGB_8888_Config.
     size_t stride = pixel_size * raw_data_size.width();
 
     size_t encoded_bytes =
         etc1_get_encoded_data_size(encoded_size.width(), encoded_size.height());
-    SkImageInfo info = {encoded_size.width(),
-                        encoded_size.height(),
-                        kUnknown_SkColorType,
-                        kUnpremul_SkAlphaType};
+    SkImageInfo info = SkImageInfo::Make(encoded_size.width(),
+                                         encoded_size.height(),
+                                         kUnknown_SkColorType,
+                                         kUnpremul_SkAlphaType);
     skia::RefPtr<SkData> etc1_pixel_data = skia::AdoptRef(
         SkData::NewFromMalloc(new uint8_t[encoded_bytes], encoded_bytes));
     skia::RefPtr<SkMallocPixelRef> etc1_pixel_ref = skia::AdoptRef(
         SkMallocPixelRef::NewWithData(info, 0, NULL, etc1_pixel_data.get()));
 
     etc1_pixel_ref->lockPixels();
     bool success = etc1_encode_image(
         reinterpret_cast<unsigned char*>(raw_data.getPixels()),
         raw_data_size.width(),
         raw_data_size.height(),
@@ skipping 106 matching lines @@
   scoped_ptr<uint8_t[]> raw_data =
       scoped_ptr<uint8_t[]>(new uint8_t[data_size]);
 
   int pixel_bytes_read = file.ReadAtCurrentPos(
       reinterpret_cast<char*>(raw_data.get()),
       data_size);
 
   if (pixel_bytes_read != data_size)
     return false;
 
-  SkImageInfo info = {raw_width,
-                      raw_height,
-                      kUnknown_SkColorType,
-                      kUnpremul_SkAlphaType};
+  SkImageInfo info = SkImageInfo::Make(raw_width,
+                                       raw_height,
+                                       kUnknown_SkColorType,
+                                       kUnpremul_SkAlphaType);
 
   etc1_pixel_data = skia::AdoptRef(
       SkData::NewFromMalloc(raw_data.release(), data_size));
 
   *out_pixels = skia::AdoptRef(
       SkMallocPixelRef::NewWithData(info,
                                     0,
                                     NULL,
                                     etc1_pixel_data.get()));
 
@@ skipping 130 matching lines @@
   dst_bitmap.eraseColor(0);
   SkAutoLockPixels dst_bitmap_lock(dst_bitmap);
 
   SkCanvas canvas(dst_bitmap);
   canvas.scale(new_scale, new_scale);
   canvas.drawBitmap(bitmap, 0, 0, NULL);
   dst_bitmap.setImmutable();
 
   return std::make_pair(dst_bitmap, new_scale * scale);
 }