| Index: chrome/browser/history/history_backend_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/history/history_backend_unittest.cc (revision 27832)
|
| +++ chrome/browser/history/history_backend_unittest.cc (working copy)
|
| @@ -1,10 +1,10 @@
|
| -// 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"
|
| @@ -231,14 +231,14 @@
|
| // 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);
|
|
|
| @@ -405,7 +405,7 @@
|
|
|
| // 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));
|
|
|
|
|