Revert "Fix NTP thumbnail generation"

chrome/browser/thumbnails/simple_thumbnail_crop.cc

 // Copyright (c) 2013 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/thumbnails/simple_thumbnail_crop.h"
 
 #include "base/metrics/histogram.h"
 #include "content/public/browser/browser_thread.h"
 #include "skia/ext/platform_canvas.h"
 #include "ui/base/layout.h"
@@ skipping 27 matching lines @@
 }
 
 void SimpleThumbnailCrop::ProcessBitmap(
     scoped_refptr<ThumbnailingContext> context,
     const ConsumerCallback& callback,
     const SkBitmap& bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (bitmap.isNull() || bitmap.empty())
     return;
 
-  ClipResult clip_result = context->clip_result();
   SkBitmap thumbnail = CreateThumbnail(
       bitmap,
       ComputeTargetSizeAtMaximumScale(target_size_),
-      &clip_result);
+      &context->clip_result);
 
-  context->SetBoringScore(color_utils::CalculateBoringScore(thumbnail));
-  context->set_clip_result(clip_result);
-  bool good_clipping =
-      (clip_result == CLIP_RESULT_WIDER_THAN_TALL ||
-       clip_result == CLIP_RESULT_TALLER_THAN_WIDE ||
-       clip_result == CLIP_RESULT_NOT_CLIPPED);
-  context->SetGoodClipping(good_clipping);
+  context->score.boring_score = color_utils::CalculateBoringScore(thumbnail);
+  context->score.good_clipping =
+      (context->clip_result == CLIP_RESULT_WIDER_THAN_TALL ||
+       context->clip_result == CLIP_RESULT_TALLER_THAN_WIDE ||
+       context->clip_result == CLIP_RESULT_NOT_CLIPPED);
 
   callback.Run(*context.get(), thumbnail);
 }
 
 SkBitmap SimpleThumbnailCrop::GetClippedBitmap(const SkBitmap& bitmap,
                                                int desired_width,
                                                int desired_height,
                                                ClipResult* clip_result) {
   gfx::Rect clipping_rect =
       GetClippingRect(gfx::Size(bitmap.width(), bitmap.height()),
@@ skipping 126 matching lines @@
       clipped_bitmap.height() == result.height())
     clipped_bitmap.copyTo(&result, kN32_SkColorType);
 #endif
 
   LOCAL_HISTOGRAM_TIMES(kThumbnailHistogramName,
                         base::TimeTicks::Now() - begin_compute_thumbnail);
   return result;
 }
 
 } // namespace thumbnails