Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2018)

Unified Diff: chrome/browser/history/history_backend_unittest.cc

Issue 10332163: Revert 137075 - Get rid of Image::Image(SkBitmap*) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/history/history_backend_unittest.cc
===================================================================
--- chrome/browser/history/history_backend_unittest.cc (revision 137075)
+++ chrome/browser/history/history_backend_unittest.cc (working copy)
@@ -346,19 +346,16 @@
// Add thumbnails for each page. The |Images| take ownership of SkBitmap
// created from decoding the images.
ThumbnailScore score(0.25, true, true);
- scoped_ptr<SkBitmap> google_bitmap(
+ gfx::Image google_bitmap(
gfx::JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
- gfx::Image google_image(*google_bitmap);
-
Time time;
GURL gurl;
- backend_->thumbnail_db_->SetPageThumbnail(gurl, row1_id, &google_image,
+ backend_->thumbnail_db_->SetPageThumbnail(gurl, row1_id, &google_bitmap,
score, time);
- scoped_ptr<SkBitmap> weewar_bitmap(
+ gfx::Image weewar_bitmap(
gfx::JPEGCodec::Decode(kWeewarThumbnail, sizeof(kWeewarThumbnail)));
- gfx::Image weewar_image(*weewar_bitmap);
- backend_->thumbnail_db_->SetPageThumbnail(gurl, row2_id, &weewar_image,
+ backend_->thumbnail_db_->SetPageThumbnail(gurl, row2_id, &weewar_bitmap,
score, time);
// Star row1.
« no previous file with comments | « chrome/browser/history/expire_history_backend_unittest.cc ('k') | chrome/browser/history/history_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698