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

chrome/browser/icon_loader_linux.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/icon_loader.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
+#include "app/gfx/codec/png_codec.h"
 #include "base/file_util.h"
-#include "base/gfx/png_decoder.h"
 #include "base/logging.h"
 #include "base/linux_util.h"
 #include "base/message_loop.h"
 #include "base/mime_util.h"
 #include "base/thread.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 static int SizeToInt(IconLoader::IconSize size) {
   int pixels = 48;
@@ skipping 35 matching lines @@
     int stride = gdk_pixbuf_get_rowstride(pixbuf);
 
     if (!gdk_pixbuf_get_has_alpha(pixbuf)) {
       LOG(WARNING) << "Got an image with no alpha channel, aborting load.";
     } else {
       uint8_t* BGRA_pixels = base::BGRAToRGBA(pixels, width, height, stride);
       std::vector<unsigned char> pixel_vector;
       pixel_vector.resize(height * stride);
       memcpy(const_cast<unsigned char*>(pixel_vector.data()), BGRA_pixels,
              height * stride);
-      bitmap_ = PNGDecoder::CreateSkBitmapFromBGRAFormat(pixel_vector,
-                                                         width, height);
+      bitmap_ = gfx::PNGCodec::CreateSkBitmapFromBGRAFormat(pixel_vector,
+                                                            width, height);
       free(BGRA_pixels);
     }
   } else {
     LOG(WARNING) << "Unsupported file type or load error: " <<
                     filename_.value();
   }
 
   g_object_unref(loader);
 
   NotifyDelegate();
 }