Revert of Fix NTP thumbnail generation

chrome/browser/thumbnails/simple_thumbnail_crop.cc

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 5af2ae9e927df93a294624230060582b75052b98..debdfa42936de3e24bd158a47e6c5ce552d6b9f1 100644
--- a/chrome/browser/thumbnails/simple_thumbnail_crop.cc
+++ b/chrome/browser/thumbnails/simple_thumbnail_crop.cc
@@ -45,19 +45,16 @@
   if (bitmap.isNull() || bitmap.empty())
     return;
 
-  ClipResult clip_result;
   SkBitmap thumbnail = CreateThumbnail(
       bitmap,
       ComputeTargetSizeAtMaximumScale(target_size_),
-      &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->clip_result);
+
+  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);
 }