Add a PNGEncoder helper function that takes an SkBitmap,

chrome/browser/importer/importer.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/importer/importer.h"
 
 #include <map>
 #include <set>
 
 #include "base/file_util.h"
@@ skipping 371 matching lines @@
   if (decoded.width() != kFavIconSize || decoded.height() != kFavIconSize) {
     // The bitmap is not the correct size, re-sample.
     int new_width = decoded.width();
     int new_height = decoded.height();
     calc_favicon_target_size(&new_width, &new_height);
     decoded = skia::ImageOperations::Resize(
         decoded, skia::ImageOperations::RESIZE_LANCZOS3, new_width, new_height);
   }
 
   // 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;
 }
 
 // ImporterHost.
 
 ImporterHost::ImporterHost()
     : observer_(NULL),
       task_(NULL),
       importer_(NULL),
       file_loop_(g_browser_process->file_thread()->message_loop()),
@@ skipping 302 matching lines @@
     ProfileInfo* google_toolbar = new ProfileInfo();
     google_toolbar->browser_type = GOOGLE_TOOLBAR5;
     google_toolbar->description = l10n_util::GetString(
                                   IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
     google_toolbar->source_path.clear();
     google_toolbar->app_path.clear();
     google_toolbar->services_supported = FAVORITES;
     source_profiles_.push_back(google_toolbar);
   }
 }