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

chrome/browser/fav_icon_helper.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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/fav_icon_helper.h"
 
 #include "build/build_config.h"
 
+#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/favicon_size.h"
-#include "base/gfx/png_decoder.h"
-#include "base/gfx/png_encoder.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "skia/ext/image_operations.h"
 
 FavIconHelper::FavIconHelper(TabContents* tab_contents)
     : tab_contents_(tab_contents),
@@ skipping 36 matching lines @@
     // possible to get here.
     return;
   }
 
   const SkBitmap& sized_image =
       (image.width() == kFavIconSize && image.height() == kFavIconSize)
       ? image : ConvertToFavIconSize(image);
 
   if (GetFaviconService() && !profile()->IsOffTheRecord()) {
     std::vector<unsigned char> image_data;
-    PNGEncoder::EncodeBGRASkBitmap(sized_image, false, &image_data);
+    gfx::PNGCodec::EncodeBGRASkBitmap(sized_image, false, &image_data);
     GetFaviconService()->SetFavicon(i->second.url, i->second.fav_icon_url,
                                     image_data);
   }
 
   if (i->second.url == url_) {
     NavigationEntry* entry = GetEntry();
     if (entry)
       UpdateFavIcon(entry, sized_image);
   }
 
   download_requests_.erase(i);
 }
 
 void FavIconHelper::FavIconDownloadFailed(int download_id) {
   DownloadRequests::iterator i = download_requests_.find(download_id);
   if (i != download_requests_.end())
     download_requests_.erase(i);
 }
 
 void FavIconHelper::UpdateFavIcon(NavigationEntry* entry,
                                   const std::vector<unsigned char>& data) {
   SkBitmap image;
-  PNGDecoder::Decode(&data, &image);
+  gfx::PNGCodec::Decode(&data, &image);
   UpdateFavIcon(entry, image);
 }
 
 void FavIconHelper::UpdateFavIcon(NavigationEntry* entry,
                                   const SkBitmap& image) {
   // No matter what happens, we need to mark the favicon as being set.
   entry->favicon().set_is_valid(true);
 
   if (image.empty())
     return;
@@ skipping 161 matching lines @@
   int width = image.width();
   int height = image.height();
   if (width > 0 && height > 0) {
     calc_favicon_target_size(&width, &height);
     return skia::ImageOperations::Resize(
           image, skia::ImageOperations::RESIZE_LANCZOS3,
           width, height);
   }
   return image;
 }