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

components/suggestions/image_manager.h

 // 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.
 
 #ifndef COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_
 #define COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace suggestions {
 
 class ImageData;
-class ImageEncoder;
 class ImageFetcher;
 class SuggestionsProfile;
 
 // A class used to fetch server images asynchronously and manage the caching
 // layer (both in memory and on disk).
 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();
 
   virtual void Initialize(const SuggestionsProfile& suggestions);
 
   // Should be called from the UI thread.
   virtual void GetImageForURL(
       const GURL& url,
       base::Callback<void(const GURL&, const SkBitmap*)> callback);
@@ skipping 61 matching lines @@
   void OnDatabaseInit(bool success);
   // Will transfer the loaded |entries| in memory (|image_map_|).
   void OnDatabaseLoad(bool success, scoped_ptr<ImageDataVector> entries);
   void OnDatabaseSave(bool success);
 
   // Take entries from the database and put them in the local cache.
   void LoadEntriesInCache(scoped_ptr<ImageDataVector> entries);
 
   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_;
 
   // Map from website URL to request information, used for pending cache
   // requests while the database hasn't loaded.
   ImageCacheRequestMap pending_cache_requests_;
 
   // Holding the bitmaps in memory, keyed by website URL string.
   ImageMap image_map_;
 
   scoped_ptr<ImageFetcher> image_fetcher_;
 
-  scoped_ptr<ImageEncoder> image_encoder_;
-
   scoped_ptr<leveldb_proto::ProtoDatabase<ImageData> > database_;
 
   bool database_ready_;
 
   base::WeakPtrFactory<ImageManager> weak_ptr_factory_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageManager);
 };
 
 }  // namespace suggestions
 
 #endif  // COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_