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

chrome/browser/search_engines/template_url_table_model.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/search_engines/template_url_table_model.h"
 
+#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
-#include "base/gfx/png_decoder.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 // Group IDs used by TemplateURLTableModel.
 static const int kMainGroupID = 0;
@@ skipping 72 matching lines @@
   }
 
   void OnFavIconDataAvailable(
       FaviconService::Handle handle,
       bool know_favicon,
       scoped_refptr<RefCountedBytes> data,
       bool expired,
       GURL icon_url) {
     load_state_ = LOADED;
     if (know_favicon && data.get() &&
-        PNGDecoder::Decode(&data->data, &fav_icon_)) {
+        gfx::PNGCodec::Decode(&data->data, &fav_icon_)) {
       model_->FavIconAvailable(this);
     }
   }
 
   const TemplateURL& template_url_;
   SkBitmap fav_icon_;
   LoadState load_state_;
   TemplateURLTableModel* model_;
   CancelableRequestConsumer request_consumer_;
 
@@ skipping 248 matching lines @@
 void TemplateURLTableModel::FavIconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLModelChanged() {
   Reload();
 }