Add a PNGEncoder helper function that takes an SkBitmap,

chrome/browser/gears_integration.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/gears_integration.h"
 
 #include "base/gfx/png_encoder.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
@@ skipping 99 matching lines @@
 };
 
 // Helper function to convert a 16x16 favicon to a data: URL with the icon
 // encoded as a PNG.
 static GURL ConvertSkBitmapToDataURL(const SkBitmap& icon) {
   DCHECK(!icon.isNull());
   DCHECK(icon.width() == 16 && icon.height() == 16);
 
   // Get the FavIcon data.
   std::vector<unsigned char> icon_data;
-  {
-    SkAutoLockPixels icon_lock(icon);
-    PNGEncoder::Encode(static_cast<unsigned char*>(icon.getPixels()),
-                       PNGEncoder::FORMAT_BGRA, icon.width(),
-                       icon.height(), icon.width()* 4, false,
-                       &icon_data);
-  }
+  PNGEncoder::EncodeBGRASkBitmap(icon, false, &icon_data);
 
   // Base64-encode it (to make it a data URL).
   std::string icon_data_str(reinterpret_cast<char*>(&icon_data[0]),
                             icon_data.size());
   std::string icon_base64_encoded;
   net::Base64Encode(icon_data_str, &icon_base64_encoded);
   GURL icon_url("data:image/png;base64," + icon_base64_encoded);
 
   return icon_url;
 }
@@ skipping 174 matching lines @@
 void RunnableMethodTraits<QueryShortcutsCommand>::ReleaseCallee(
     QueryShortcutsCommand* remover) {
 }
 
 void GearsQueryShortcuts(GearsQueryShortcutsCallback* callback) {
   CPHandleCommand(GEARSPLUGINCOMMAND_GET_SHORTCUT_LIST,
       new QueryShortcutsCommand(callback),
       NULL);
 }