| Index: chrome/browser/thumbnails/simple_thumbnail_crop.cc
 | 
| diff --git a/chrome/browser/thumbnails/simple_thumbnail_crop.cc b/chrome/browser/thumbnails/simple_thumbnail_crop.cc
 | 
| index f010e84b4d21aaf9dad30754874c0b7a1eec5532..9b1aeae27733e9c3f8a252589b0afc4f429cf307 100644
 | 
| --- a/chrome/browser/thumbnails/simple_thumbnail_crop.cc
 | 
| +++ b/chrome/browser/thumbnails/simple_thumbnail_crop.cc
 | 
| @@ -36,9 +36,10 @@ ClipResult SimpleThumbnailCrop::GetCanvasCopyInfo(
 | 
|    return clip_result;
 | 
|  }
 | 
|  
 | 
| -void SimpleThumbnailCrop::ProcessBitmap(ThumbnailingContext* context,
 | 
| -                                        const ConsumerCallback& callback,
 | 
| -                                        const SkBitmap& bitmap) {
 | 
| +void SimpleThumbnailCrop::ProcessBitmap(
 | 
| +    scoped_refptr<ThumbnailingContext> context,
 | 
| +    const ConsumerCallback& callback,
 | 
| +    const SkBitmap& bitmap) {
 | 
|    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 | 
|    if (bitmap.isNull() || bitmap.empty())
 | 
|      return;
 | 
| @@ -134,20 +135,6 @@ gfx::Size SimpleThumbnailCrop::GetCopySizeForThumbnail(
 | 
|    return copy_size;
 | 
|  }
 | 
|  
 | 
| -SimpleThumbnailCrop::~SimpleThumbnailCrop() {
 | 
| -}
 | 
| -
 | 
| -// Returns the size of the thumbnail stored in the database in pixel.
 | 
| -gfx::Size SimpleThumbnailCrop::GetThumbnailSizeInPixel() const {
 | 
| -  // Determine the resolution of the thumbnail based on the maximum scale
 | 
| -  // factor.
 | 
| -  // TODO(mazda|oshima): Update thumbnail when the max scale factor changes.
 | 
| -  // crbug.com/159157.
 | 
| -  float max_scale_factor =
 | 
| -      ui::GetScaleFactorScale(ui::GetMaxScaleFactor());
 | 
| -  return gfx::ToFlooredSize(gfx::ScaleSize(target_size_, max_scale_factor));
 | 
| -}
 | 
| -
 | 
|  gfx::Rect SimpleThumbnailCrop::GetClippingRect(const gfx::Size& source_size,
 | 
|                                                 const gfx::Size& desired_size,
 | 
|                                                 ClipResult* clip_result) {
 | 
| @@ -190,6 +177,20 @@ gfx::Rect SimpleThumbnailCrop::GetClippingRect(const gfx::Size& source_size,
 | 
|    return clipping_rect;
 | 
|  }
 | 
|  
 | 
| +SimpleThumbnailCrop::~SimpleThumbnailCrop() {
 | 
| +}
 | 
| +
 | 
| +// Returns the size of the thumbnail stored in the database in pixel.
 | 
| +gfx::Size SimpleThumbnailCrop::GetThumbnailSizeInPixel() const {
 | 
| +  // Determine the resolution of the thumbnail based on the maximum scale
 | 
| +  // factor.
 | 
| +  // TODO(mazda|oshima): Update thumbnail when the max scale factor changes.
 | 
| +  // crbug.com/159157.
 | 
| +  float max_scale_factor =
 | 
| +      ui::GetScaleFactorScale(ui::GetMaxScaleFactor());
 | 
| +  return gfx::ToFlooredSize(gfx::ScaleSize(target_size_, max_scale_factor));
 | 
| +}
 | 
| +
 | 
|  // Creates a downsampled thumbnail from the given bitmap.
 | 
|  // store. The returned bitmap will be isNull if there was an error creating it.
 | 
|  SkBitmap SimpleThumbnailCrop::CreateThumbnail(const SkBitmap& bitmap,
 | 
| 
 |