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

chrome/browser/history/expire_history_backend_unittest.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 "app/gfx/codec/jpeg_codec.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/jpeg_codec.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/expire_history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/text_database_manager.h"
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
@@ skipping 178 matching lines @@
   url_ids[1] = main_db_->AddURL(url_row2);
 
   URLRow url_row3(GURL("http://www.google.com/3"));
   url_row3.set_last_visit(visit_times[3]);
   url_row3.set_favicon_id(favicon2);
   url_row3.set_visit_count(1);
   url_ids[2] = main_db_->AddURL(url_row3);
 
   // Thumbnails for each URL.
   scoped_ptr<SkBitmap> thumbnail(
-      JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
+      gfx::JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
   ThumbnailScore score(0.25, true, true, Time::Now());
 
   Time time;
   GURL gurl;
   thumb_db_->SetPageThumbnail(gurl, url_ids[0], *thumbnail, score, time);
   thumb_db_->SetPageThumbnail(gurl, url_ids[1], *thumbnail, score, time);
   thumb_db_->SetPageThumbnail(gurl, url_ids[2], *thumbnail, score, time);
 
   // Four visits.
   VisitRow visit_row1;
@@ skipping 520 matching lines @@
   EXPECT_TRUE(all->Read(now, main_db_.get(), &visits, 1));
   EXPECT_EQ(1U, visits.size());
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistant FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history