Revert of [Suggestions] Create ImageEncoder, to abstract away image encode/decode.

components/suggestions/image_manager_unittest.cc

 // Copyright 2014 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 <string>
-#include <vector>
 
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "components/leveldb_proto/proto_database.h"
 #include "components/leveldb_proto/testing/fake_db.h"
-#include "components/suggestions/image_encoder.h"
 #include "components/suggestions/image_fetcher.h"
 #include "components/suggestions/image_fetcher_delegate.h"
 #include "components/suggestions/image_manager.h"
-#include "components/suggestions/jpeg/jpeg_image_encoder.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;
 
@@ skipping 15 matching lines @@
 class MockImageFetcher : public suggestions::ImageFetcher {
  public:
   MockImageFetcher() {}
   virtual ~MockImageFetcher() {}
   MOCK_METHOD3(StartOrQueueNetworkRequest,
                void(const GURL&, const GURL&,
                     base::Callback<void(const GURL&, const SkBitmap*)>));
   MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
 };
 
-class MockImageEncoder : public suggestions::ImageEncoder {
- public:
-  MockImageEncoder() {}
-  virtual ~MockImageEncoder() {}
-  MOCK_METHOD1(DecodeImage,
-               SkBitmap*(const std::vector<unsigned char>&));
-  MOCK_METHOD2(EncodeImage, bool(const SkBitmap&, std::vector<unsigned char>*));
-};
-
 class ImageManagerTest : public testing::Test {
  public:
   ImageManagerTest()
       : mock_image_fetcher_(NULL),
         num_callback_null_called_(0),
         num_callback_valid_called_(0) {}
 
   virtual void SetUp() override {
     fake_db_ = new FakeDB<ImageData>(&db_model_);
-    jpeg_image_encoder_ = new JpegImageEncoder();
-    image_manager_.reset(CreateImageManager(fake_db_, jpeg_image_encoder_));
+    image_manager_.reset(CreateImageManager(fake_db_));
   }
 
   virtual void TearDown() override {
     fake_db_ = NULL;
     db_model_.clear();
     image_manager_.reset();
   }
 
   void InitializeDefaultImageMapAndDatabase(ImageManager* image_manager,
                                             FakeDB<ImageData>* fake_db) {
@@ skipping 16 matching lines @@
   ImageData GetSampleImageData(const std::string& url) {
     // Create test bitmap.
     SkBitmap bm;
     // Being careful with the Bitmap. There are memory-related issue in
     // crbug.com/101781.
     bm.allocN32Pixels(4, 4);
     bm.eraseColor(SK_ColorRED);
     ImageData data;
     data.set_url(url);
     std::vector<unsigned char> encoded;
-    EXPECT_TRUE(jpeg_image_encoder_->EncodeImage(bm, &encoded));
+    EXPECT_TRUE(ImageManager::EncodeImage(bm, &encoded));
     data.set_data(std::string(encoded.begin(), encoded.end()));
     return data;
   }
 
   void OnImageAvailable(base::RunLoop* loop, const GURL& url,
                         const SkBitmap* bitmap) {
     if (bitmap) {
       num_callback_valid_called_++;
     } else {
       num_callback_null_called_++;
     }
     loop->Quit();
   }
 
-  ImageManager* CreateImageManager(FakeDB<ImageData>* fake_db,
-                                   JpegImageEncoder* jpeg_image_encoder) {
+  ImageManager* CreateImageManager(FakeDB<ImageData>* fake_db) {
     mock_image_fetcher_ = new StrictMock<MockImageFetcher>();
     EXPECT_CALL(*mock_image_fetcher_, SetImageFetcherDelegate(_));
     return new ImageManager(
         scoped_ptr<ImageFetcher>(mock_image_fetcher_),
-        scoped_ptr<ImageEncoder>(jpeg_image_encoder),
         scoped_ptr<leveldb_proto::ProtoDatabase<ImageData> >(fake_db),
         FakeDB<ImageData>::DirectoryForTestDB());
   }
 
   EntryMap db_model_;
   // Owned by the ImageManager under test.
   FakeDB<ImageData>* fake_db_;
-  JpegImageEncoder* jpeg_image_encoder_;
 
   MockImageFetcher* mock_image_fetcher_;
 
   int num_callback_null_called_;
   int num_callback_valid_called_;
   // Under test.
   scoped_ptr<ImageManager> image_manager_;
 };
 
 TEST_F(ImageManagerTest, InitializeTest) {
@@ skipping 36 matching lines @@
 TEST_F(ImageManagerTest, GetImageForURLNetworkCacheHit) {
   SuggestionsProfile suggestions_profile;
   ChromeSuggestion* suggestion = suggestions_profile.add_suggestions();
   suggestion->set_url(kTestUrl1);
   // The URL we set is invalid, to show that it will fail from network.
   suggestion->set_thumbnail(kInvalidImagePath);
 
   // Create the ImageManager with an added entry in the database.
   AddEntry(GetSampleImageData(kTestUrl1), &db_model_);
   FakeDB<ImageData>* fake_db = new FakeDB<ImageData>(&db_model_);
-  image_manager_.reset(CreateImageManager(fake_db, new JpegImageEncoder()));
+  image_manager_.reset(CreateImageManager(fake_db));
   image_manager_->Initialize(suggestions_profile);
   fake_db->InitCallback(true);
   fake_db->LoadCallback(true);
   // Expect something in the cache.
   SkBitmap* bitmap = image_manager_->GetBitmapFromCache(GURL(kTestUrl1));
   EXPECT_FALSE(bitmap->isNull());
 
   base::RunLoop run_loop;
   image_manager_->GetImageForURL(GURL(kTestUrl1),
                                  base::Bind(&ImageManagerTest::OnImageAvailable,
                                             base::Unretained(this), &run_loop));
   run_loop.Run();
 
   EXPECT_EQ(0, num_callback_null_called_);
   EXPECT_EQ(1, num_callback_valid_called_);
 }
 
 }  // namespace suggestions