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

chrome/browser/history/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 <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 328 matching lines @@
 
   // The in-memory backend should have been set and it should have gotten the
   // typed URL.
   ASSERT_TRUE(mem_backend_.get());
   URLRow outrow1;
   EXPECT_TRUE(mem_backend_->db_->GetRowForURL(row1.url(), NULL));
 
   // 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.
   bookmark_model_.AddURL(
       bookmark_model_.bookmark_bar_node(), 0, string16(), row1.url());
 
   // Set full text index for each one.
   backend_->text_database_->AddPageData(row1.url(), row1_id, visit1_id,
                                         row1.last_visit(),
                                         UTF8ToUTF16("Title 1"),
@@ skipping 1138 matching lines @@
   EXPECT_EQ(cur_version, file_version);
 
   // Check visit_duration column in visits table is created and set to 0.
   s1.Assign(archived_db.GetUniqueStatement(
       "SELECT visit_duration FROM visits LIMIT 1"));
   ASSERT_TRUE(s1.Step());
   EXPECT_EQ(0, s1.ColumnInt(0));
 }
 
 }  // namespace history