Add a PNGEncoder helper function that takes an SkBitmap,

chrome/browser/fav_icon_helper.cc

 // Copyright (c) 2006-2008 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/fav_icon_helper.h"
 
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
@@ skipping 66 matching lines @@
     // possible to get here.
     return;
   }
 
   const SkBitmap& sized_image =
       (image.width() == kFavIconSize && image.height() == kFavIconSize)
       ? image : ConvertToFavIconSize(image);
 
   if (GetHistoryService() && !profile()->IsOffTheRecord()) {
     std::vector<unsigned char> image_data;
-    SkAutoLockPixels icon_lock(sized_image);
-    PNGEncoder::Encode(
-        reinterpret_cast<unsigned char*>(sized_image.getPixels()),
-        PNGEncoder::FORMAT_BGRA, sized_image.width(),
-        sized_image.height(), sized_image.width()* 4, false,
-        &image_data);
+    PNGEncoder::EncodeBGRASkBitmap(sized_image, false, &image_data);
     GetHistoryService()->SetFavIcon(i->second.url, i->second.fav_icon_url,
                                     image_data);
   }
 
   if (i->second.url == url_) {
     NavigationEntry* entry = GetEntry();
     if (entry)
       UpdateFavIcon(entry, sized_image);
   }
 
@@ skipping 154 matching lines @@
   int height = image.height();
   if (width > 0 && height > 0) {
     calc_favicon_target_size(&width, &height);
     return skia::ImageOperations::Resize(
           image, skia::ImageOperations::RESIZE_LANCZOS3,
           width, height);
   }
   return image;
 }