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

components/suggestions/image_manager.h

Index: components/suggestions/image_manager.h
diff --git a/components/suggestions/image_manager.h b/components/suggestions/image_manager.h
index e538a6b917e2e7581b7585d04f8fbe6f5dd25705..93fad29d6aa451c97a3252cec378d3866e9a8917 100644
--- a/components/suggestions/image_manager.h
+++ b/components/suggestions/image_manager.h
@@ -28,6 +28,7 @@ class URLRequestContextGetter;
 namespace suggestions {
 
 class ImageData;
+class ImageEncoder;
 class ImageFetcher;
 class SuggestionsProfile;
 
@@ -37,7 +38,10 @@ class ImageManager : public ImageFetcherDelegate {
  public:
   typedef std::vector<ImageData> ImageDataVector;
 
+  // This class takes ownership of |image_fetcher|, |image_encoder| and
+  // |database|.
   ImageManager(scoped_ptr<ImageFetcher> image_fetcher,
+               scoped_ptr<ImageEncoder> image_encoder,
                scoped_ptr<leveldb_proto::ProtoDatabase<ImageData> > database,
                const base::FilePath& database_dir);
   virtual ~ImageManager();
@@ -119,11 +123,6 @@ class ImageManager : public ImageFetcherDelegate {
 
   void ServePendingCacheRequests();
 
-  // From SkBitmap to the vector of JPEG-encoded bytes, |dst|. Visible only for
-  // testing.
-  static bool EncodeImage(const SkBitmap& bitmap,
-                          std::vector<unsigned char>* dest);
-
   // Map from URL to image URL. Should be kept up to date when a new
   // SuggestionsProfile is available.
   std::map<GURL, GURL> image_url_map_;
@@ -137,6 +136,8 @@ class ImageManager : public ImageFetcherDelegate {
 
   scoped_ptr<ImageFetcher> image_fetcher_;
 
+  scoped_ptr<ImageEncoder> image_encoder_;
+
   scoped_ptr<leveldb_proto::ProtoDatabase<ImageData> > database_;
 
   bool database_ready_;