Revert of Fix NTP thumbnail generation

chrome/browser/thumbnails/content_based_thumbnailing_algorithm_unittest.cc

 // Copyright 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 "base/message_loop/message_loop.h"
 #include "chrome/browser/thumbnails/content_based_thumbnailing_algorithm.h"
 #include "chrome/browser/thumbnails/simple_thumbnail_crop.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/scrollbar_size.h"
 
 namespace thumbnails {
 
 typedef testing::Test ContentBasedThumbnailingAlgorithmTest;
 
 class ConsumerCallbackCatcher {
  public:
   ConsumerCallbackCatcher()
       : called_back_(false), clip_result_(CLIP_RESULT_UNPROCESSED) {
   }
 
   void UiThreadCallback(const ThumbnailingContext& context,
                         const SkBitmap& bitmap) {
     called_back_ = true;
     captured_bitmap_ = bitmap;
-    clip_result_ = context.clip_result();
-    score_ = context.score();
+    clip_result_ = context.clip_result;
+    score_ = context.score;
   }
 
   bool called_back() const {
     return called_back_;
   }
 
   const SkBitmap& captured_bitmap() const {
     return captured_bitmap_;
   }
 
@@ skipping 52 matching lines @@
             SimpleThumbnailCrop::GetCopySizeForThumbnail(
                 ui::SCALE_FACTOR_100P, thumbnail_size).ToString());
   EXPECT_EQ(gfx::Point(0, 0).ToString(), clipping_rect.origin().ToString());
 }
 
 TEST_F(ContentBasedThumbnailingAlgorithmTest, PrepareSourceBitmap) {
   const gfx::Size thumbnail_size(312, 165);
   const gfx::Size copy_size(400, 200);
   scoped_refptr<ThumbnailingContext> context(
       ThumbnailingContext::CreateThumbnailingContextForTest());
-  context->set_requested_copy_size(copy_size);
+  context->requested_copy_size = copy_size;
 
   // This calls for exercising two distinct paths: with prior clipping and
   // without.
   SkBitmap source;
   source.allocN32Pixels(800, 600);
   source.eraseARGB(255, 50, 150, 200);
   SkBitmap result = ContentBasedThumbnailingAlgorithm::PrepareSourceBitmap(
       source, thumbnail_size, context.get());
-  EXPECT_EQ(CLIP_RESULT_SOURCE_SAME_AS_TARGET, context->clip_result());
+  EXPECT_EQ(CLIP_RESULT_SOURCE_SAME_AS_TARGET, context->clip_result);
   EXPECT_GE(result.width(), copy_size.width());
   EXPECT_GE(result.height(), copy_size.height());
   EXPECT_LT(result.width(), source.width());
   EXPECT_LT(result.height(), source.height());
   // The check below is a bit of a side effect: since the image was clipped
   // by scrollbar_size, it cannot be shrunk and thus what we get below is
   // true.
   EXPECT_NEAR(result.width(), source.width(), gfx::scrollbar_size());
   EXPECT_NEAR(result.height(), source.height(), gfx::scrollbar_size());
 
   result = ContentBasedThumbnailingAlgorithm::PrepareSourceBitmap(
       source, thumbnail_size, context.get());
-  EXPECT_EQ(CLIP_RESULT_SOURCE_SAME_AS_TARGET, context->clip_result());
+  EXPECT_EQ(CLIP_RESULT_SOURCE_SAME_AS_TARGET, context->clip_result);
   EXPECT_GE(result.width(), copy_size.width());
   EXPECT_GE(result.height(), copy_size.height());
   EXPECT_LT(result.width(), source.width());
   EXPECT_LT(result.height(), source.height());
 }
 
 TEST_F(ContentBasedThumbnailingAlgorithmTest, CreateRetargetedThumbnail) {
   // This tests the invocation of the main thumbnail-making apparatus.
   // The actual content is not really of concern here, just check the plumbing.
   const gfx::Size image_size(1200, 800);
   gfx::Canvas canvas(image_size, 1.0f, true);
 
   // The image consists of vertical non-overlapping stripes 150 pixels wide.
   canvas.FillRect(gfx::Rect(200, 200, 800, 400), SkColorSetRGB(255, 255, 255));
   SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
 
   ConsumerCallbackCatcher catcher;
   const gfx::Size thumbnail_size(432, 284);
   scoped_refptr<ThumbnailingContext> context(
       ThumbnailingContext::CreateThumbnailingContextForTest());
-  context->set_requested_copy_size(image_size);
-  context->set_clip_result(CLIP_RESULT_SOURCE_SAME_AS_TARGET);
+  context->requested_copy_size = image_size;
+  context->clip_result = CLIP_RESULT_SOURCE_SAME_AS_TARGET;
 
   base::MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
   ContentBasedThumbnailingAlgorithm::CreateRetargetedThumbnail(
       source,
       thumbnail_size,
       context,
       base::Bind(&ConsumerCallbackCatcher::UiThreadCallback,
                  base::Unretained(&catcher)));
   message_loop.RunUntilIdle();
   ASSERT_TRUE(catcher.called_back());
   EXPECT_TRUE(catcher.score().good_clipping);
   EXPECT_FALSE(catcher.captured_bitmap().empty());
   EXPECT_LT(catcher.captured_bitmap().width(), source.width());
   EXPECT_LT(catcher.captured_bitmap().height(), source.height());
 }
 
 }  // namespace thumbnails