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

chrome/browser/history/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/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/history_backend.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "googleurl/src/gurl.h"
@@ skipping 206 matching lines @@
 
   // The in-memory backend should have been set and it should have gotten the
   // typed URL.
   ASSERT_TRUE(mem_backend_.get());
   URLRow outrow1;
   EXPECT_TRUE(mem_backend_->db_->GetRowForURL(row1.url(), NULL));
 
   // Add thumbnails for each page.
   ThumbnailScore score(0.25, true, true);
   scoped_ptr<SkBitmap> google_bitmap(
-      JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
+      gfx::JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
 
   Time time;
   GURL gurl;
   backend_->thumbnail_db_->SetPageThumbnail(gurl, row1_id, *google_bitmap,
                                             score, time);
   scoped_ptr<SkBitmap> weewar_bitmap(
-     JPEGCodec::Decode(kWeewarThumbnail, sizeof(kWeewarThumbnail)));
+     gfx::JPEGCodec::Decode(kWeewarThumbnail, sizeof(kWeewarThumbnail)));
   backend_->thumbnail_db_->SetPageThumbnail(gurl, row2_id, *weewar_bitmap,
                                             score, time);
 
   // Star row1.
   bookmark_model_.AddURL(
       bookmark_model_.GetBookmarkBarNode(), 0, std::wstring(), row1.url());
 
   // Set full text index for each one.
   backend_->text_database_->AddPageData(row1.url(), row1_id, visit1_id,
                                         row1.last_visit(),
@@ skipping 146 matching lines @@
   const char* thumbnail_url = "http://mail.google.com";
   const char* first_chain[] = {
     base_url,
     thumbnail_url,
     NULL
   };
   AddRedirectChain(first_chain, 0);
 
   // Add a thumbnail for the end of that redirect chain.
   scoped_ptr<SkBitmap> thumbnail(
-      JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
+      gfx::JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
   backend_->SetPageThumbnail(GURL(thumbnail_url), *thumbnail,
                              ThumbnailScore(0.25, true, true));
 
   // Write a second URL chain so that if you were to simply check what
   // "http://mail" redirects to, you wouldn't see the URL that has
   // contains the thumbnail.
   const char* second_chain[] = {
     base_url,
     "http://mail.google.com/somewhere/else",
     NULL
@@ skipping 138 matching lines @@
 
   // If the URL is bookmarked, it should get added to history with 0 visits.
   bookmark_model_.AddURL(bookmark_model_.GetBookmarkBarNode(), 0,
                          std::wstring(), url3);
   backend_->SetImportedFavicons(favicons);
   EXPECT_FALSE(backend_->db_->GetRowForURL(url3, &url_row3) == 0);
   EXPECT_TRUE(url_row3.visit_count() == 0);
 }
 
 }  // namespace history