Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/favicon/favicon_handler_unittest.cc

 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 24 matching lines @@
   }
 }
 
 // Fill the given data buffer with valid png data.
 void FillBitmap(int w, int h, std::vector<unsigned char>* output) {
   SkBitmap bitmap;
   FillDataToBitmap(w, h, &bitmap);
   gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, output);
 }
 
-void SetFaviconBitmapResult(
+void SetFaviconRawBitmapResult(
     const GURL& icon_url,
     favicon_base::IconType icon_type,
     bool expired,
-    std::vector<favicon_base::FaviconBitmapResult>* favicon_bitmap_results) {
+    std::vector<favicon_base::FaviconRawBitmapResult>* favicon_bitmap_results) {
   scoped_refptr<base::RefCountedBytes> data(new base::RefCountedBytes());
   FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
-  favicon_base::FaviconBitmapResult bitmap_result;
+  favicon_base::FaviconRawBitmapResult bitmap_result;
   bitmap_result.expired = expired;
   bitmap_result.bitmap_data = data;
   // Use a pixel size other than (0,0) as (0,0) has a special meaning.
   bitmap_result.pixel_size = gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
   bitmap_result.icon_type = icon_type;
   bitmap_result.icon_url = icon_url;
 
   favicon_bitmap_results->push_back(bitmap_result);
 }
 
-void SetFaviconBitmapResult(
+void SetFaviconRawBitmapResult(
     const GURL& icon_url,
-    std::vector<favicon_base::FaviconBitmapResult>* favicon_bitmap_results) {
-  SetFaviconBitmapResult(icon_url,
-                         favicon_base::FAVICON,
-                         false /* expired */,
-                         favicon_bitmap_results);
+    std::vector<favicon_base::FaviconRawBitmapResult>* favicon_bitmap_results) {
+  SetFaviconRawBitmapResult(icon_url,
+                            favicon_base::FAVICON,
+                            false /* expired */,
+                            favicon_bitmap_results);
 }
 
 // This class is used to save the download request for verifying with test case.
 // It also will be used to invoke the onDidDownload callback.
 class DownloadHandler {
  public:
   explicit DownloadHandler(TestFaviconHandler* favicon_helper)
       : favicon_helper_(favicon_helper),
         failed_(false) {
   }
@@ skipping 76 matching lines @@
   }
 
   virtual ~HistoryRequestHandler() {}
   void InvokeCallback();
 
   const GURL page_url_;
   const GURL icon_url_;
   const int icon_type_;
   const std::vector<unsigned char> bitmap_data_;
   const gfx::Size size_;
-  std::vector<favicon_base::FaviconBitmapResult> history_results_;
+  std::vector<favicon_base::FaviconRawBitmapResult> history_results_;
   favicon_base::FaviconResultsCallback callback_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryRequestHandler);
 };
 
 }  // namespace
 
 class TestFaviconClient : public FaviconClient {
  public:
@@ skipping 309 matching lines @@
       page_url, &client, &driver, FaviconHandler::FAVICON, false);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
 
-  SetFaviconBitmapResult(icon_url, &history_handler->history_results_);
+  SetFaviconRawBitmapResult(icon_url, &history_handler->history_results_);
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
@@ skipping 21 matching lines @@
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
 
   // Set icon data expired
-  SetFaviconBitmapResult(icon_url,
-                         favicon_base::FAVICON,
-                         true /* expired */,
-                         &history_handler->history_results_);
+  SetFaviconRawBitmapResult(icon_url,
+                            favicon_base::FAVICON,
+                            true /* expired */,
+                            &history_handler->history_results_);
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
@@ skipping 45 matching lines @@
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
 
   // Set valid icon data.
-  SetFaviconBitmapResult(icon_url, &history_handler->history_results_);
+  SetFaviconRawBitmapResult(icon_url, &history_handler->history_results_);
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
@@ skipping 60 matching lines @@
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
 
   // Set non empty but invalid data.
-  favicon_base::FaviconBitmapResult bitmap_result;
+  favicon_base::FaviconRawBitmapResult bitmap_result;
   bitmap_result.expired = false;
   // Empty bitmap data is invalid.
   bitmap_result.bitmap_data = new base::RefCountedBytes();
   bitmap_result.pixel_size = gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
   bitmap_result.icon_type = favicon_base::FAVICON;
   bitmap_result.icon_url = icon_url;
   history_handler->history_results_.clear();
   history_handler->history_results_.push_back(bitmap_result);
 
   // Send history response.
@@ skipping 50 matching lines @@
       page_url, &client, &driver, FaviconHandler::FAVICON, false);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
 
-  SetFaviconBitmapResult(icon_url, &history_handler->history_results_);
+  SetFaviconRawBitmapResult(icon_url, &history_handler->history_results_);
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
@@ skipping 11 matching lines @@
   ASSERT_EQ(favicon_base::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
   EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate find icon.
-  SetFaviconBitmapResult(new_icon_url, &history_handler->history_results_);
+  SetFaviconRawBitmapResult(new_icon_url, &history_handler->history_results_);
   history_handler->InvokeCallback();
 
   // Shouldn't request download favicon
   EXPECT_FALSE(helper.download_handler()->HasDownload());
 
   // Verify the favicon status.
   EXPECT_EQ(new_icon_url, driver.GetActiveFaviconURL());
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_FALSE(driver.GetActiveFaviconImage().IsEmpty());
 }
@@ skipping 82 matching lines @@
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
   EXPECT_EQ(favicon_base::TOUCH_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Reset download handler
   download_handler->Reset();
 
   // Simulates getting a expired icon from history.
-  SetFaviconBitmapResult(new_icon_url,
-                         favicon_base::TOUCH_ICON,
-                         true /* expired */,
-                         &history_handler->history_results_);
+  SetFaviconRawBitmapResult(new_icon_url,
+                            favicon_base::TOUCH_ICON,
+                            true /* expired */,
+                            &history_handler->history_results_);
   history_handler->InvokeCallback();
 
   // Verify the download request.
   EXPECT_TRUE(helper.download_handler()->HasDownload());
   EXPECT_EQ(new_icon_url, download_handler->GetImageUrl());
 
   helper.set_history_handler(NULL);
 
   // Simulates icon being downloaded.
   download_handler->InvokeCallback();
@@ skipping 104 matching lines @@
   download_handler->InvokeCallback();
   // The downloaded icon should be thrown away as there is favicon update.
   EXPECT_FALSE(helper.history_handler());
 
   download_handler->Reset();
 
   // Simulates getting the icon from history.
   scoped_ptr<HistoryRequestHandler> handler;
   handler.reset(new HistoryRequestHandler(
       page_url, latest_icon_url, favicon_base::TOUCH_ICON, callback));
-  SetFaviconBitmapResult(latest_icon_url,
-                         favicon_base::TOUCH_ICON,
-                         false /* expired */,
-                         &handler->history_results_);
+  SetFaviconRawBitmapResult(latest_icon_url,
+                            favicon_base::TOUCH_ICON,
+                            false /* expired */,
+                            &handler->history_results_);
   handler->InvokeCallback();
 
   // No download request.
   EXPECT_FALSE(download_handler->HasDownload());
 }
 
 #if !defined(OS_ANDROID)
 
 // Test the favicon which is selected when the web page provides several
 // favicons and none of the favicons are cached in history.
@@ skipping 445 matching lines @@
   download_id = favicon_tab_helper->StartDownload(missing_icon_url, 0);
   EXPECT_NE(0, download_id);
   // Report download success with HTTP 200 status.
   favicon_tab_helper->DidDownloadFavicon(download_id, 200, missing_icon_url,
       empty_icons, empty_icon_sizes);
   // Icon is not marked as UnableToDownload as HTTP status is not 404.
   EXPECT_FALSE(favicon_service->WasUnableToDownloadFavicon(missing_icon_url));
 }
 
 }  // namespace.