Convert FaviconStatus::bitmap from SkBitmap to gfx::Image.

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/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 class TestFaviconHandler;
 
 using content::NavigationEntry;
 using content::WebContents;
 
 namespace {
 
 // Fill the given bmp with valid png data.
 void FillDataToBitmap(int w, int h, SkBitmap* bmp) {
@@ skipping 386 matching lines @@
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
   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()->GetFavicon().url);
   EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_FALSE(helper.GetEntry()->GetFavicon().bitmap.empty());
+  EXPECT_FALSE(helper.GetEntry()->GetFavicon().image.IsEmpty());
 }
 
 TEST_F(FaviconHandlerTest, UpdateAndDownloadFavicon) {
   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");
 
   TestFaviconHandlerDelegate delegate(contents());
   Profile* profile = Profile::FromBrowserContext(
       contents()->GetBrowserContext());
@@ skipping 69 matching lines @@
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
   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()->GetFavicon().url);
   EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_FALSE(helper.GetEntry()->GetFavicon().bitmap.empty());
+  EXPECT_FALSE(helper.GetEntry()->GetFavicon().image.IsEmpty());
 }
 
 TEST_F(FaviconHandlerTest, UpdateFavicon) {
   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");
 
   TestFaviconHandlerDelegate delegate(contents());
   Profile* profile = Profile::FromBrowserContext(
       contents()->GetBrowserContext());
@@ skipping 54 matching lines @@
   history_handler->favicon_data_.icon_url = new_icon_url;
   history_handler->favicon_data_.image_data = data;
   history_handler->InvokeCallback();
 
   // Shouldn't request download favicon
   EXPECT_FALSE(helper.download_handler()->HasDownload());
 
   // Verify the favicon status.
   EXPECT_EQ(new_icon_url, helper.GetEntry()->GetFavicon().url);
   EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_FALSE(helper.GetEntry()->GetFavicon().bitmap.empty());
+  EXPECT_FALSE(helper.GetEntry()->GetFavicon().image.IsEmpty());
 }
 
 TEST_F(FaviconHandlerTest, Download2ndFaviconURLCandidate) {
   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");
 
   TestFaviconHandlerDelegate delegate(contents());
   Profile* profile = Profile::FromBrowserContext(
       contents()->GetBrowserContext());
@@ skipping 287 matching lines @@
   ASSERT_TRUE(download_handler->HasDownload());
   EXPECT_EQ(icon_url_preferred1, download_handler->GetImageUrl());
   download_handler->SetImageSize(gfx::kFaviconSize);
   download_handler->InvokeCallback();
   // Verify that this was detected as an exact match and image_urls_ is cleared.
   EXPECT_EQ(0U, handler.image_urls().size());
 
   // Verify correct icon size chosen.
   EXPECT_EQ(icon_url_preferred1, handler.GetEntry()->GetFavicon().url);
   EXPECT_TRUE(handler.GetEntry()->GetFavicon().valid);
-  EXPECT_FALSE(handler.GetEntry()->GetFavicon().bitmap.empty());
-  EXPECT_EQ(gfx::kFaviconSize, handler.GetEntry()->GetFavicon().bitmap.width());
+  EXPECT_FALSE(handler.GetEntry()->GetFavicon().image.IsEmpty());
+  EXPECT_EQ(gfx::kFaviconSize,
+            handler.GetEntry()->GetFavicon().image.ToSkBitmap()->width());
 }
 
 TEST_F(FaviconHandlerTest, FirstFavicon) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
   const GURL icon_url_preferred1("http://www.google.com/favicon_preferred1");
   const GURL icon_url_large("http://www.google.com/favicon_large");
 
   TestFaviconHandlerDelegate delegate(contents());
   Profile* profile = Profile::FromBrowserContext(
@@ skipping 33 matching lines @@
   ASSERT_TRUE(download_handler->HasDownload());
   EXPECT_EQ(icon_url_preferred1, download_handler->GetImageUrl());
   download_handler->SetImageSize(gfx::kFaviconSize);
   download_handler->InvokeCallback();
   // Verify that this was detected as an exact match and image_urls_ is cleared.
   EXPECT_EQ(0U, handler.image_urls().size());
 
   // Verify correct icon size chosen.
   EXPECT_EQ(icon_url_preferred1, handler.GetEntry()->GetFavicon().url);
   EXPECT_TRUE(handler.GetEntry()->GetFavicon().valid);
-  EXPECT_FALSE(handler.GetEntry()->GetFavicon().bitmap.empty());
-  EXPECT_EQ(gfx::kFaviconSize, handler.GetEntry()->GetFavicon().bitmap.width());
+  EXPECT_FALSE(handler.GetEntry()->GetFavicon().image.IsEmpty());
+  EXPECT_EQ(gfx::kFaviconSize,
+            handler.GetEntry()->GetFavicon().image.ToSkBitmap()->width());
 }
 
 }  // namespace.