Make icon_messages use the IPC macros for defining the structs and the serialization code, and mo...

chrome/browser/favicon_helper_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/favicon_helper.h"
 
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "ui/gfx/codec/png_codec.h"
@@ skipping 289 matching lines @@
   history_handler->favicon_data_.image_data = data;
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHelper status
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(icon_url, helper.GetEntry()->favicon().url());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
-  urls.push_back(FaviconURL(icon_url, FAVICON));
+  urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON));
   DownloadHandler::UpdateFaviconURL(&helper, urls);
 
   // Verify FaviconHelper status
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FAVICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon shouldn't request to download icon.
   DownloadHandler* download_handler = helper.download_handler();
   ASSERT_FALSE(download_handler);
 }
 
 TEST_F(FaviconHelperTest, DownloadFavicon) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
 
@@ skipping 13 matching lines @@
   history_handler->favicon_data_.expired = true;
   history_handler->favicon_data_.icon_url = icon_url;
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHelper status
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(icon_url, helper.GetEntry()->favicon().url());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
-  urls.push_back(FaviconURL(icon_url, FAVICON));
+  urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON));
   DownloadHandler::UpdateFaviconURL(&helper, urls);
 
   // Verify FaviconHelper status
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FAVICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should request to download icon now.
   DownloadHandler* download_handler = helper.download_handler();
   ASSERT_TRUE(download_handler);
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->image_url_);
   EXPECT_EQ(kFaviconSize, download_handler->image_size_);
 
   // Reset the history_handler to verify whether favicon is set.
   helper.set_history_handler(NULL);
 
   // Smulates download done.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend and navigation entry.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FAVICON, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->image_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Verify NavigationEntry.
   EXPECT_EQ(icon_url, helper.GetEntry()->favicon().url());
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_FALSE(helper.GetEntry()->favicon().bitmap().empty());
 }
 
 TEST_F(FaviconHelperTest, UpdateAndDownloadFavicon) {
@@ skipping 25 matching lines @@
   // Verify FaviconHelper status.
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(icon_url, helper.GetEntry()->favicon().url());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
-  urls.push_back(FaviconURL(new_icon_url, FAVICON));
+  urls.push_back(FaviconURL(new_icon_url, FaviconURL::FAVICON));
   DownloadHandler::UpdateFaviconURL(&helper, urls);
 
   // Verify FaviconHelper status.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(new_icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FAVICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
   // The favicon status's url should be updated.
   ASSERT_EQ(new_icon_url, helper.GetEntry()->favicon().url());
 
   // 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, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate not find icon.
   history_handler->favicon_data_.known_icon = false;
   history_handler->InvokeCallback();
 
   // Favicon should request to download icon now.
   DownloadHandler* download_handler = helper.download_handler();
   ASSERT_TRUE(download_handler);
   // Verify the download request.
   EXPECT_EQ(new_icon_url, download_handler->image_url_);
   EXPECT_EQ(kFaviconSize, download_handler->image_size_);
 
   // Reset the history_handler to verify whether favicon is set.
   helper.set_history_handler(NULL);
 
   // Smulates download done.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend and navigation entry.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FAVICON, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->image_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Verify NavigationEntry.
   EXPECT_EQ(new_icon_url, helper.GetEntry()->favicon().url());
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_FALSE(helper.GetEntry()->favicon().bitmap().empty());
 }
 
 TEST_F(FaviconHelperTest, UpdateFavicon) {
@@ skipping 25 matching lines @@
   // Verify FaviconHelper status.
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(icon_url, helper.GetEntry()->favicon().url());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
-  urls.push_back(FaviconURL(new_icon_url, FAVICON));
+  urls.push_back(FaviconURL(new_icon_url, FaviconURL::FAVICON));
   DownloadHandler::UpdateFaviconURL(&helper, urls);
 
   // Verify FaviconHelper status.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(new_icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FAVICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
   // The favicon status's url should be updated.
   ASSERT_EQ(new_icon_url, helper.GetEntry()->favicon().url());
 
   // 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, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate find icon.
   history_handler->favicon_data_.known_icon = true;
   history_handler->favicon_data_.icon_type = history::FAVICON;
   history_handler->favicon_data_.expired = false;
   history_handler->favicon_data_.icon_url = new_icon_url;
   history_handler->favicon_data_.image_data = data;
   history_handler->InvokeCallback();
 
@@ skipping 29 matching lines @@
   // Verify FaviconHelper status.
   EXPECT_FALSE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(GURL(), helper.GetEntry()->favicon().url());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
-  urls.push_back(FaviconURL(icon_url, TOUCH_PRECOMPOSED_ICON));
-  urls.push_back(FaviconURL(new_icon_url, TOUCH_ICON));
-  urls.push_back(FaviconURL(new_icon_url, FAVICON));
+  urls.push_back(FaviconURL(icon_url, FaviconURL::TOUCH_PRECOMPOSED_ICON));
+  urls.push_back(FaviconURL(new_icon_url, FaviconURL::TOUCH_ICON));
+  urls.push_back(FaviconURL(new_icon_url, FaviconURL::FAVICON));
 
   DownloadHandler::UpdateFaviconURL(&helper, urls);
 
   // Verify FaviconHelper status.
   EXPECT_EQ(2U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(TOUCH_PRECOMPOSED_ICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON,
+            helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
-  EXPECT_EQ(TOUCH_PRECOMPOSED_ICON, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate not find icon.
   history_handler->favicon_data_.known_icon = false;
   history_handler->InvokeCallback();
 
   // Should request download favicon.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(download_handler);
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->image_url_);
   EXPECT_EQ(0, download_handler->image_size_);
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
   helper.set_history_handler(NULL);
   // Smulates download failed.
   download_handler->failed_ = true;
   download_handler->InvokeCallback();
 
   // Left 1 url.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   EXPECT_EQ(new_icon_url, helper.current_candidate()->icon_url);
-  EXPECT_EQ(TOUCH_ICON, helper.current_candidate()->icon_type);
+  EXPECT_EQ(FaviconURL::TOUCH_ICON, 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(TOUCH_ICON, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::TOUCH_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Reset download handler
   helper.set_download_handler(NULL);
 
   // Smulates getting a expired icon from history.
   history_handler->favicon_data_.known_icon = true;
   history_handler->favicon_data_.icon_type = history::TOUCH_ICON;
   history_handler->favicon_data_.expired = true;
   history_handler->favicon_data_.icon_url = new_icon_url;
@@ skipping 10 matching lines @@
 
   helper.set_history_handler(NULL);
 
   // Simulates icon being downloaded.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(TOUCH_ICON, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::TOUCH_ICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->image_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 }
 
 TEST_F(FaviconHelperTest, UpdateDuringDownloading) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
   const GURL new_icon_url("http://www.google.com/new_favicon");
 
   TestFaviconHelper helper(page_url, contents(), FaviconHelper::TOUCH);
@@ skipping 14 matching lines @@
   // Verify FaviconHelper status.
   EXPECT_FALSE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(GURL(), helper.GetEntry()->favicon().url());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
-  urls.push_back(FaviconURL(icon_url, TOUCH_PRECOMPOSED_ICON));
-  urls.push_back(FaviconURL(new_icon_url, TOUCH_ICON));
-  urls.push_back(FaviconURL(new_icon_url, FAVICON));
+  urls.push_back(FaviconURL(icon_url, FaviconURL::TOUCH_PRECOMPOSED_ICON));
+  urls.push_back(FaviconURL(new_icon_url, FaviconURL::TOUCH_ICON));
+  urls.push_back(FaviconURL(new_icon_url, FaviconURL::FAVICON));
 
   DownloadHandler::UpdateFaviconURL(&helper, urls);
 
   // Verify FaviconHelper status.
   EXPECT_EQ(2U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(TOUCH_PRECOMPOSED_ICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON,
+            helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
-  EXPECT_EQ(TOUCH_PRECOMPOSED_ICON, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate not find icon.
   history_handler->favicon_data_.known_icon = false;
   history_handler->InvokeCallback();
 
   // Should request download favicon.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(download_handler);
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->image_url_);
   EXPECT_EQ(0, download_handler->image_size_);
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
   helper.set_history_handler(NULL);
   const GURL latest_icon_url("http://www.google.com/latest_favicon");
   std::vector<FaviconURL> latest_urls;
-  latest_urls.push_back(FaviconURL(latest_icon_url, TOUCH_ICON));
+  latest_urls.push_back(FaviconURL(latest_icon_url, FaviconURL::TOUCH_ICON));
   DownloadHandler::UpdateFaviconURL(&helper, latest_urls);
   EXPECT_EQ(1U, helper.urls().size());
   EXPECT_EQ(latest_icon_url, helper.current_candidate()->icon_url);
-  EXPECT_EQ(TOUCH_ICON, helper.current_candidate()->icon_type);
+  EXPECT_EQ(FaviconURL::TOUCH_ICON, helper.current_candidate()->icon_type);
 
   // Whether new icon is requested from history
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(latest_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(TOUCH_ICON, history_handler->icon_type_);
+  EXPECT_EQ(FaviconURL::TOUCH_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
   // Save the callback for late use.
   FaviconService::FaviconDataCallback* callback = history_handler->callback_;
   // Prevent the callback from being released.
   history_handler->callback_ = NULL;
   helper.set_history_handler(NULL);
 
@@ skipping 16 matching lines @@
   FillBitmap(kFaviconSize, kFaviconSize, &data->data);
   handler->favicon_data_.image_data = data;
 
   handler->InvokeCallback();
 
   // No download request.
   EXPECT_FALSE(helper.download_handler());
 }
 
 }  // namespace.