Decode ImageManager cached images on demand.

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 "base/files/file_path.h"
 #include "base/run_loop.h"
+#include "base/thread_task_runner_handle.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/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"
@@ skipping 87 matching lines @@
       num_callback_null_called_++;
     }
     loop->Quit();
   }
 
   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<leveldb_proto::ProtoDatabase<ImageData> >(fake_db),
-        FakeDB<ImageData>::DirectoryForTestDB());
+        scoped_ptr<leveldb_proto::ProtoDatabase<ImageData>>(fake_db),
+        FakeDB<ImageData>::DirectoryForTestDB(),
+        base::ThreadTaskRunnerHandle::Get());
   }
 
   EntryMap db_model_;
   // Owned by the ImageManager under test.
   FakeDB<ImageData>* fake_db_;
 
   MockImageFetcher* mock_image_fetcher_;
 
   int num_callback_null_called_;
   int num_callback_valid_called_;
+
+  base::MessageLoop message_loop_;
+
   // Under test.
   scoped_ptr<ImageManager> image_manager_;
 };
 
 TEST_F(ImageManagerTest, InitializeTest) {
   SuggestionsProfile suggestions_profile;
   ChromeSuggestion* suggestion = suggestions_profile.add_suggestions();
   suggestion->set_url(kTestUrl1);
   suggestion->set_thumbnail(kTestImagePath);
 
@@ skipping 36 matching lines @@
   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));
   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());
+  auto encoded_image =
+      image_manager_->GetEncodedImageFromCache(GURL(kTestUrl1));
+  EXPECT_NE(nullptr, encoded_image);
 
   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