[Suggestions] Make ThumbnailManager implement ImageManager

chrome/browser/search/suggestions/thumbnail_manager_browsertest.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 "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/suggestions/proto/suggestions.pb.h"
@@ skipping 63 matching lines @@
   void InitializeTestBitmapData() {
     FakeDB<ThumbnailData>* test_fake_db = new FakeDB<ThumbnailData>(&db_model_);
     test_thumbnail_manager_.reset(CreateThumbnailManager(test_fake_db));
 
     suggestions::SuggestionsProfile suggestions_profile;
     suggestions::ChromeSuggestion* suggestion =
         suggestions_profile.add_suggestions();
     suggestion->set_url(kTestBitmapUrl);
     suggestion->set_thumbnail(test_server_.GetURL(kTestImagePath).spec());
 
-    test_thumbnail_manager_->InitializeThumbnailMap(suggestions_profile);
+    test_thumbnail_manager_->InitializeImageMap(suggestions_profile);
 
     // Initialize empty database.
     test_fake_db->InitCallback(true);
     test_fake_db->LoadCallback(true);
 
     base::RunLoop run_loop;
     // Fetch existing URL.
-    test_thumbnail_manager_->GetPageThumbnail(
+    test_thumbnail_manager_->GetImageForURL(
         GURL(kTestBitmapUrl),
         base::Bind(&ThumbnailManagerBrowserTest::OnTestThumbnailAvailable,
                    base::Unretained(this), &run_loop));
     run_loop.Run();
   }
 
   void OnTestThumbnailAvailable(base::RunLoop* loop, const GURL& url,
                                 const SkBitmap* bitmap) {
     CHECK(bitmap);
     // Copy the resource locally.
     test_bitmap_ = *bitmap;
     loop->Quit();
   }
 
   void InitializeDefaultThumbnailMapAndDatabase(
       ThumbnailManager* thumbnail_manager, FakeDB<ThumbnailData>* fake_db) {
     CHECK(thumbnail_manager);
     CHECK(fake_db);
 
     suggestions::SuggestionsProfile suggestions_profile;
     suggestions::ChromeSuggestion* suggestion =
         suggestions_profile.add_suggestions();
     suggestion->set_url(kTestUrl1);
     suggestion->set_thumbnail(test_server_.GetURL(kTestImagePath).spec());
 
-    thumbnail_manager->InitializeThumbnailMap(suggestions_profile);
+    thumbnail_manager->InitializeImageMap(suggestions_profile);
 
     // Initialize empty database.
     fake_db->InitCallback(true);
     fake_db->LoadCallback(true);
   }
 
   ThumbnailData GetSampleThumbnailData(const std::string& url) {
     ThumbnailData data;
     data.set_url(url);
     std::vector<unsigned char> encoded;
@@ skipping 34 matching lines @@
   SkBitmap test_bitmap_;
   scoped_ptr<ThumbnailManager> test_thumbnail_manager_;
 
   int num_callback_null_called_;
   int num_callback_valid_called_;
   net::SpawnedTestServer test_server_;
   // Under test.
   scoped_ptr<ThumbnailManager> thumbnail_manager_;
 };
 
-IN_PROC_BROWSER_TEST_F(ThumbnailManagerBrowserTest, GetPageThumbnailNetwork) {
+IN_PROC_BROWSER_TEST_F(ThumbnailManagerBrowserTest, GetImageForURLNetwork) {
   InitializeDefaultThumbnailMapAndDatabase(thumbnail_manager_.get(), fake_db_);
 
   base::RunLoop run_loop;
   // Fetch existing URL.
-  thumbnail_manager_->GetPageThumbnail(
+  thumbnail_manager_->GetImageForURL(
       GURL(kTestUrl1),
       base::Bind(&ThumbnailManagerBrowserTest::OnThumbnailAvailable,
                  base::Unretained(this), &run_loop));
   run_loop.Run();
 
   EXPECT_EQ(0, num_callback_null_called_);
   EXPECT_EQ(1, num_callback_valid_called_);
 
   base::RunLoop run_loop2;
   // Fetch non-existing URL.
-  thumbnail_manager_->GetPageThumbnail(
+  thumbnail_manager_->GetImageForURL(
       GURL(kTestUrl2),
       base::Bind(&ThumbnailManagerBrowserTest::OnThumbnailAvailable,
                  base::Unretained(this), &run_loop2));
   run_loop2.Run();
 
   EXPECT_EQ(1, num_callback_null_called_);
   EXPECT_EQ(1, num_callback_valid_called_);
 }
 
 IN_PROC_BROWSER_TEST_F(ThumbnailManagerBrowserTest,
-                       GetPageThumbnailNetworkMultiple) {
+                       GetImageForURLNetworkMultiple) {
   InitializeDefaultThumbnailMapAndDatabase(thumbnail_manager_.get(), fake_db_);
 
   // Fetch non-existing URL, and add more while request is in flight.
   base::RunLoop run_loop;
   for (int i = 0; i < 5; i++) {
     // Fetch existing URL.
-    thumbnail_manager_->GetPageThumbnail(
+    thumbnail_manager_->GetImageForURL(
         GURL(kTestUrl1),
         base::Bind(&ThumbnailManagerBrowserTest::OnThumbnailAvailable,
                    base::Unretained(this), &run_loop));
   }
   run_loop.Run();
 
   EXPECT_EQ(0, num_callback_null_called_);
   EXPECT_EQ(5, num_callback_valid_called_);
 }
 
 IN_PROC_BROWSER_TEST_F(ThumbnailManagerBrowserTest,
-                       GetPageThumbnailNetworkInvalid) {
+                       GetImageForURLNetworkInvalid) {
   SuggestionsProfile suggestions_profile;
   ChromeSuggestion* suggestion = suggestions_profile.add_suggestions();
   suggestion->set_url(kTestUrl1);
   suggestion->set_thumbnail(test_server_.GetURL(kInvalidImagePath).spec());
 
-  thumbnail_manager_->InitializeThumbnailMap(suggestions_profile);
+  thumbnail_manager_->InitializeImageMap(suggestions_profile);
 
   // Database will be initialized and loaded without anything in it.
   fake_db_->InitCallback(true);
   fake_db_->LoadCallback(true);
 
   base::RunLoop run_loop;
   // Fetch existing URL that has invalid thumbnail.
-  thumbnail_manager_->GetPageThumbnail(
+  thumbnail_manager_->GetImageForURL(
       GURL(kTestUrl1),
       base::Bind(&ThumbnailManagerBrowserTest::OnThumbnailAvailable,
                  base::Unretained(this), &run_loop));
   run_loop.Run();
 
   EXPECT_EQ(1, num_callback_null_called_);
   EXPECT_EQ(0, num_callback_valid_called_);
 }
 
 IN_PROC_BROWSER_TEST_F(ThumbnailManagerBrowserTest,
-                       GetPageThumbnailNetworkCacheHit) {
+                       GetImageForURLNetworkCacheHit) {
   InitializeTestBitmapData();
 
   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(test_server_.GetURL(kInvalidImagePath).spec());
 
   // Create the ThumbnailManager with an added entry in the database.
   AddEntry(GetSampleThumbnailData(kTestUrl1), &db_model_);
   FakeDB<ThumbnailData>* fake_db = new FakeDB<ThumbnailData>(&db_model_);
   thumbnail_manager_.reset(CreateThumbnailManager(fake_db));
-  thumbnail_manager_->InitializeThumbnailMap(suggestions_profile);
+  thumbnail_manager_->InitializeImageMap(suggestions_profile);
   fake_db->InitCallback(true);
   fake_db->LoadCallback(true);
   // Expect something in the cache.
   SkBitmap* bitmap = thumbnail_manager_->GetBitmapFromCache(GURL(kTestUrl1));
   EXPECT_FALSE(bitmap->isNull());
 
   base::RunLoop run_loop;
-  thumbnail_manager_->GetPageThumbnail(
+  thumbnail_manager_->GetImageForURL(
       GURL(kTestUrl1),
       base::Bind(&ThumbnailManagerBrowserTest::OnThumbnailAvailable,
                  base::Unretained(this), &run_loop));
   run_loop.Run();
 
   EXPECT_EQ(0, num_callback_null_called_);
   EXPECT_EQ(1, num_callback_valid_called_);
 }
 
 }  // namespace suggestions