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

components/suggestions/image_manager_unittest.cc

Index: components/suggestions/image_manager_unittest.cc
diff --git a/components/suggestions/image_manager_unittest.cc b/components/suggestions/image_manager_unittest.cc
index cd391760982139594efc5001298e13ce34eb458e..57dd8bf0ba775b21837bb64e363b3d918bbbb6b2 100644
--- a/components/suggestions/image_manager_unittest.cc
+++ b/components/suggestions/image_manager_unittest.cc
@@ -3,17 +3,14 @@
 // 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"
@@ -49,15 +46,6 @@
   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()
@@ -67,8 +55,7 @@
 
   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 {
@@ -105,7 +92,7 @@
     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;
   }
@@ -120,13 +107,11 @@
     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());
   }
@@ -134,7 +119,6 @@
   EntryMap db_model_;
   // Owned by the ImageManager under test.
   FakeDB<ImageData>* fake_db_;
-  JpegImageEncoder* jpeg_image_encoder_;
 
   MockImageFetcher* mock_image_fetcher_;
 
@@ -191,7 +175,7 @@
   // 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);