Add a PNGEncoder helper function that takes an SkBitmap,

chrome/browser/webdata/web_database.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/webdata/web_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 183 matching lines @@
   SQLStatement s;
   if (s.prepare(db_,
                 "INSERT OR REPLACE INTO web_app_icons "
                 "(url, width, height, image) VALUES (?, ?, ?, ?)")
       != SQLITE_OK) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
   std::vector<unsigned char> image_data;
-
-  SkAutoLockPixels pixel_lock(image);
-  PNGEncoder::Encode(reinterpret_cast<unsigned char*>(image.getPixels()),
-                     PNGEncoder::FORMAT_BGRA, image.width(),
-                     image.height(), image.width() * 4, false, &image_data);
+  PNGEncoder::EncodeBGRASkBitmap(image, false, &image_data);
 
   s.bind_string(0, history::HistoryDatabase::GURLToDatabaseURL(url));
   s.bind_int(1, image.width());
   s.bind_int(2, image.height());
   s.bind_blob(3, &image_data.front(), static_cast<int>(image_data.size()));
   return s.step() == SQLITE_DONE;
 }
 
 bool WebDatabase::GetWebAppImages(const GURL& url,
                                   std::vector<SkBitmap>* images) {
@@ skipping 915 matching lines @@
 
     // Add successive versions here.  Each should set the version number and
     // compatible version number as appropriate, then fall through to the next
     // case.
 
     case kCurrentVersionNumber:
       // No migration needed.
       return;
   }
 }