Add a PNGEncoder helper function that takes an SkBitmap,

chrome/browser/importer/importer.cc

Index: chrome/browser/importer/importer.cc
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
old mode 100644
new mode 100755
index 52a035db4f030fead44c35b209d740cee97a1cad..f3cb3920f733f1532034f8075857ad1a19a04c4a
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -389,10 +389,7 @@ bool Importer::ReencodeFavicon(const unsigned char* src_data, size_t src_len,
   }
 
   // Encode our bitmap as a PNG.
-  SkAutoLockPixels decoded_lock(decoded);
-  PNGEncoder::Encode(reinterpret_cast<unsigned char*>(decoded.getPixels()),
-                     PNGEncoder::FORMAT_BGRA, decoded.width(),
-                     decoded.height(), decoded.width() * 4, false, png_data);
+  PNGEncoder::EncodeBGRASkBitmap(decoded, false, png_data);
   return true;
 }