Revert 137075 - Get rid of Image::Image(SkBitmap*)

chrome/browser/history/expire_history_backend_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 212 matching lines @@
   url_ids[1] = main_db_->AddURL(url_row2);
   thumb_db_->AddIconMapping(url_row2.url(), favicon1);
 
   URLRow url_row3(GURL("http://www.google.com/3"));
   url_row3.set_last_visit(visit_times[3]);
   url_row3.set_visit_count(1);
   url_ids[2] = main_db_->AddURL(url_row3);
   thumb_db_->AddIconMapping(url_row3.url(), favicon2);
 
   // Thumbnails for each URL. |thumbnail| takes ownership of decoded SkBitmap.
-  scoped_ptr<SkBitmap> thumbnail_bitmap(
+  gfx::Image thumbnail(
       gfx::JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
-  gfx::Image thumbnail(*thumbnail_bitmap);
   ThumbnailScore score(0.25, true, true, Time::Now());
 
   Time time;
   GURL gurl;
   top_sites_->SetPageThumbnail(url_row1.url(), &thumbnail, score);
   top_sites_->SetPageThumbnail(url_row2.url(), &thumbnail, score);
   top_sites_->SetPageThumbnail(url_row3.url(), &thumbnail, score);
 
   // Four visits.
   VisitRow visit_row1;
@@ skipping 710 matching lines @@
   main_db_->GetVisitsForURL(url_id, &archived_visits);
   EXPECT_EQ(0U, archived_visits.size());
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistent FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history