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

chrome/browser/gtk/list_store_favicon_loader.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/gtk/list_store_favicon_loader.h"
 
 #include <vector>
 
+#include "app/gfx/codec/png_codec.h"
 #include "base/gfx/gtk_util.h"
-#include "base/gfx/png_decoder.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ListStoreFavIconLoader::ListStoreFavIconLoader(
     GtkListStore* list_store, gint favicon_col, gint favicon_handle_col,
     Profile* profile, CancelableRequestConsumer* consumer)
     : list_store_(list_store), favicon_col_(favicon_col),
       favicon_handle_col_(favicon_handle_col), profile_(profile),
       consumer_(consumer),
@@ skipping 43 matching lines @@
     scoped_refptr<RefCountedBytes> image_data, bool is_expired, GURL icon_url) {
   GtkTreeIter iter;
   if (!GetRowByFavIconHandle(handle, &iter))
     return;
   gtk_list_store_set(list_store_, &iter,
                      favicon_handle_col_, 0,
                      -1);
   if (know_fav_icon && image_data.get() && !image_data->data.empty()) {
     int width, height;
     std::vector<unsigned char> decoded_data;
-    if (PNGDecoder::Decode(&image_data->data.front(), image_data->data.size(),
-                           PNGDecoder::FORMAT_BGRA, &decoded_data, &width,
-                           &height)) {
+    if (gfx::PNGCodec::Decode(&image_data->data.front(),
+                              image_data->data.size(),
+                              gfx::PNGCodec::FORMAT_BGRA, &decoded_data,
+                              &width, &height)) {
       SkBitmap icon;
       icon.setConfig(SkBitmap::kARGB_8888_Config, width, height);
       icon.allocPixels();
       memcpy(icon.getPixels(), &decoded_data.front(),
              width * height * 4);
       GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
       gtk_list_store_set(list_store_, &iter,
                          favicon_col_, pixbuf,
                          -1);
       g_object_unref(pixbuf);
     }
   }
 }