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

chrome/browser/thumbnail_store_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.
 
 #include <string.h>
 #include <algorithm>
 #include <iostream>
 #include <vector>
 
 #include "chrome/browser/thumbnail_store.h"
 
+#include "app/gfx/codec/jpeg_codec.h"
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
 #include "base/time.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/jpeg_codec.h"
 #include "base/path_service.h"
 #include "base/ref_counted.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/ref_counted_util.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
@@ skipping 35 matching lines @@
 };
 
 void ThumbnailStoreTest::SetUp() {
   if (!file_util::GetTempDir(&db_name_))
     FAIL();
 
   // Delete any old thumbnail files if they exist.
   db_name_ = db_name_.AppendASCII("ThumbnailDB");
   file_util::Delete(db_name_, false);
 
-  google_.reset(JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
-  weewar_.reset(JPEGCodec::Decode(kWeewarThumbnail, sizeof(kWeewarThumbnail)));
+  google_.reset(gfx::JPEGCodec::Decode(kGoogleThumbnail,
+                                       sizeof(kGoogleThumbnail)));
+  weewar_.reset(gfx::JPEGCodec::Decode(kWeewarThumbnail,
+                                       sizeof(kWeewarThumbnail)));
 
   SkAutoLockPixels lock1(*google_);
   jpeg_google_ = new RefCountedBytes;
-  JPEGCodec::Encode(
+  gfx::JPEGCodec::Encode(
       reinterpret_cast<unsigned char*>(google_->getAddr32(0, 0)),
-      JPEGCodec::FORMAT_BGRA, google_->width(),
+      gfx::JPEGCodec::FORMAT_BGRA, google_->width(),
       google_->height(),
       static_cast<int>(google_->rowBytes()), 90,
       &(jpeg_google_->data));
 
   SkAutoLockPixels lock2(*weewar_);
   jpeg_weewar_ = new RefCountedBytes;
-  JPEGCodec::Encode(
+  gfx::JPEGCodec::Encode(
       reinterpret_cast<unsigned char*>(weewar_->getAddr32(0,0)),
-      JPEGCodec::FORMAT_BGRA, weewar_->width(),
+      gfx::JPEGCodec::FORMAT_BGRA, weewar_->width(),
       weewar_->height(),
       static_cast<int>(weewar_->rowBytes()), 90,
       &(jpeg_weewar_->data));
 
   store_ = new ThumbnailStore;
 
   store_->cache_.reset(new ThumbnailStore::Cache);
   store_->redirect_urls_.reset(new history::RedirectMap);
 
   store_->most_visited_urls_.reset(new ThumbnailStore::MostVisitedMap);
@@ skipping 116 matching lines @@
   (*store_->redirect_urls_)[my_url] = new RefCountedVector<GURL>(redirects);
 
   (*store_->most_visited_urls_)[url_] = my_url;
 
   EXPECT_TRUE(store_->SetPageThumbnail(GURL("google.com"), *google_, score_,
                                        false));
   EXPECT_TRUE(store_->GetPageThumbnail(my_url, &read_image));
 
   read_image->Release();
 }