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

chrome/browser/history/history_unittest.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.
 
 // History unit tests come in two flavors:
 //
 // 1. The more complicated style is that the unit test creates a full history
 //    service. This spawns a background thread for the history backend, and
 //    all communication is asynchronous. This is useful for testing more
 //    complicated things or end-to-end behavior.
 //
 // 2. The simpler style is to create a history backend on this thread and
 //    access it directly without a HistoryService object. This is much simpler
 //    because communication is synchronous. Generally, sets should go through
 //    the history backend (since there is a lot of logic) but gets can come
 //    directly from the HistoryDatabase. This is because the backend generally
 //    has no logic in the getter except threading stuff, which we don't want
 //    to run.
 
 #include <time.h>
 #include <algorithm>
 
+#include "app/gfx/codec/jpeg_codec.h"
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/jpeg_codec.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
@@ skipping 622 matching lines @@
 }
 
 // This just tests history system -> thumbnail database integration, the actual
 // thumbnail tests are in its own file.
 TEST_F(HistoryTest, Thumbnails) {
   scoped_refptr<HistoryService> history(new HistoryService);
   history_service_ = history;
   ASSERT_TRUE(history->Init(history_dir_, NULL));
 
   scoped_ptr<SkBitmap> thumbnail(
-      JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
+      gfx::JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
   static const double boringness = 0.25;
 
   const GURL url("http://www.google.com/thumbnail_test/");
   history->AddPage(url);  // Must be visited before adding a thumbnail.
   history->SetPageThumbnail(url, *thumbnail,
                             ThumbnailScore(boringness, true, true));
 
   // Make sure we get the correct thumbnail data.
   EXPECT_TRUE(history->GetPageThumbnail(url, &consumer_,
       NewCallback(static_cast<HistoryTest*>(this),
                   &HistoryTest::OnThumbnailDataAvailable)));
   thumbnail_data_.clear();
   MessageLoop::current()->Run();
   // Make sure we got a valid JPEG back. This isn't equivalent to
   // being correct, but when we're roundtripping through JPEG
   // compression and we don't have a similarity measure.
   EXPECT_TRUE(thumbnail_data_.size());
   scoped_ptr<SkBitmap> decoded_thumbnail(
-      JPEGCodec::Decode(&thumbnail_data_[0], thumbnail_data_.size()));
+      gfx::JPEGCodec::Decode(&thumbnail_data_[0], thumbnail_data_.size()));
   EXPECT_TRUE(decoded_thumbnail.get());
 
   // Request a nonexistent thumbnail and make sure we get
   // a callback and no data.
   EXPECT_TRUE(history->GetPageThumbnail(GURL("http://asdfasdf.com/"),
               &consumer_,
                   NewCallback(static_cast<HistoryTest*>(this),
                               &HistoryTest::OnThumbnailDataAvailable)));
   thumbnail_data_.clear();
   MessageLoop::current()->Run();
@@ skipping 133 matching lines @@
   history_service_ = history;
   history->ScheduleDBTask(task.get(), &request_consumer);
   request_consumer.CancelAllRequests();
   CleanupHistoryService();
   // WARNING: history has now been deleted.
   history = NULL;
   ASSERT_FALSE(task->done_invoked);
 }
 
 }  // namespace history