Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classes...

chrome/browser/webdata/web_database.cc

 // Copyright (c) 2009 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>
 
+#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
-#include "base/gfx/png_decoder.h"
-#include "base/gfx/png_encoder.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "webkit/glue/password_form.h"
 
 // Encryptor is the *wrong* way of doing things; we need to turn it into a
 // bottleneck to use the platform methods (e.g. Keychain on the Mac, Gnome
 // Keyring / KWallet on Linux). That's going to take a massive change in its
 // API... see:
@@ skipping 154 matching lines @@
 bool WebDatabase::SetWebAppImage(const GURL& url, const SkBitmap& image) {
   // Don't bother with a cached statement since this will be a relatively
   // infrequent operation.
   sql::Statement s(db_.GetUniqueStatement(
       "INSERT OR REPLACE INTO web_app_icons "
       "(url, width, height, image) VALUES (?, ?, ?, ?)"));
   if (!s)
     return false;
 
   std::vector<unsigned char> image_data;
-  PNGEncoder::EncodeBGRASkBitmap(image, false, &image_data);
+  gfx::PNGCodec::EncodeBGRASkBitmap(image, false, &image_data);
 
   s.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
   s.BindInt(1, image.width());
   s.BindInt(2, image.height());
   s.BindBlob(3, &image_data.front(), static_cast<int>(image_data.size()));
   return s.Run();
 }
 
 bool WebDatabase::GetWebAppImages(const GURL& url,
                                   std::vector<SkBitmap>* images) {
   sql::Statement s(db_.GetUniqueStatement(
       "SELECT image FROM web_app_icons WHERE url=?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
   s.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
   while (s.Step()) {
     SkBitmap image;
     std::vector<unsigned char> image_data;
     int col_bytes = s.ColumnByteLength(0);
     if (col_bytes > 0) {
       image_data.resize(col_bytes);
       memcpy(&image_data[0], s.ColumnBlob(0), col_bytes);
-      if (PNGDecoder::Decode(&image_data, &image)) {
+      if (gfx::PNGCodec::Decode(&image_data, &image)) {
         images->push_back(image);
       } else {
         // Should only have valid image data in the db.
         NOTREACHED();
       }
     }
   }
   return true;
 }
 
@@ skipping 924 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;
   }
 }