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

chrome/browser/ui/intents/web_intent_picker_controller.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 "chrome/browser/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 511 matching lines @@
 
 void WebIntentPickerController::OnFaviconDataAvailable(
     FaviconService::Handle handle, history::FaviconData favicon_data) {
   size_t index = favicon_consumer_.GetClientDataForCurrentRequest();
   if (favicon_data.is_valid()) {
     SkBitmap icon_bitmap;
 
     if (gfx::PNGCodec::Decode(favicon_data.image_data->front(),
                               favicon_data.image_data->size(),
                               &icon_bitmap)) {
-      gfx::Image icon_image(icon_bitmap);
+      gfx::Image icon_image(new SkBitmap(icon_bitmap));
       picker_model_->UpdateFaviconAt(index, icon_image);
       return;
     }
   }
 
   AsyncOperationFinished();
 }
 
 void WebIntentPickerController::OnCWSIntentServicesAvailable(
     const CWSIntentsRegistry::IntentExtensionList& extensions) {
@@ skipping 83 matching lines @@
     const base::Closure& unavailable_callback) {
   SkBitmap icon_bitmap;
   if (gfx::PNGCodec::Decode(
         reinterpret_cast<const unsigned char*>(icon_response->data()),
         icon_response->length(),
         &icon_bitmap)) {
     SkBitmap resized_icon = skia::ImageOperations::Resize(
         icon_bitmap,
         skia::ImageOperations::RESIZE_BEST,
         gfx::kFaviconSize, gfx::kFaviconSize);
-    gfx::Image icon_image(resized_icon);
+    gfx::Image icon_image(new SkBitmap(resized_icon));
 
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,
         base::Bind(callback, icon_image));
   } else {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,
         unavailable_callback);
@@ skipping 37 matching lines @@
   // If picker is non-NULL, it was set by a test.
   if (picker_ == NULL)
     picker_ = WebIntentPicker::Create(wrapper_, this, picker_model_.get());
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   if (picker_)
     picker_->Close();
 }