Removes usage of NavigationEntry from favicon_handler.*

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_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
-#include "content/public/browser/favicon_status.h"
-#include "content/public/browser/invalidate_type.h"
-#include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
 class TestFaviconHandler;
 
 using content::FaviconURL;
-using content::NavigationEntry;
-using content::WebContents;
 
 namespace {
 
 // Fill the given bmp with valid png data.
 void FillDataToBitmap(int w, int h, SkBitmap* bmp) {
   bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
   bmp->allocPixels();
 
   unsigned char* src_data =
       reinterpret_cast<unsigned char*>(bmp->getAddr32(0, 0));
@@ skipping 149 matching lines @@
   virtual FaviconService* GetFaviconService() OVERRIDE {
     // Just give none NULL value, so overridden methods can be hit.
     return (FaviconService*)(1);
   }
 
   virtual bool IsBookmarked(const GURL& url) OVERRIDE { return false; }
 };
 
 class TestFaviconDriver : public FaviconDriver {
  public:
-  TestFaviconDriver() {
-  }
+  TestFaviconDriver() : favicon_validity_(false) {}
 
   virtual ~TestFaviconDriver() {
   }
 
   virtual bool IsOffTheRecord() OVERRIDE { return false; }
 
-  virtual NavigationEntry* GetActiveEntry() OVERRIDE {
-    ADD_FAILURE() << "TestFaviconDriver::GetActiveEntry() "
-                  << "should never be called in tests.";
-    return NULL;
+  virtual const gfx::Image GetActiveFaviconImage() OVERRIDE { return image_; }
+
+  virtual const GURL GetActiveFaviconURL() OVERRIDE { return favicon_url_; }
+
+  virtual bool GetActiveFaviconValidity() OVERRIDE { return favicon_validity_; }
+
+  virtual const GURL GetActiveURL() OVERRIDE { return url_; }
+
+  virtual void SetActiveFaviconImage(gfx::Image image) OVERRIDE {
+    image_ = image;
+  }
+
+  virtual void SetActiveFaviconURL(GURL favicon_url) OVERRIDE {
+    favicon_url_ = favicon_url;
+  }
+
+  virtual void SetActiveFaviconValidity(bool favicon_validity) OVERRIDE {
+    favicon_validity_ = favicon_validity;
   }
 
   virtual int StartDownload(const GURL& url,
                             int max_bitmap_size) OVERRIDE {
     ADD_FAILURE() << "TestFaviconDriver::StartDownload() "
                   << "should never be called in tests.";
     return -1;
   }
 
   virtual void NotifyFaviconUpdated(bool icon_url_changed) OVERRIDE {
     ADD_FAILURE() << "TestFaviconDriver::NotifyFaviconUpdated() "
                   << "should never be called in tests.";
   }
 
+  void SetActiveURL(GURL url) { url_ = url; }
+
  private:
+  GURL favicon_url_;
+  GURL url_;
+  gfx::Image image_;
+  bool favicon_validity_;
   DISALLOW_COPY_AND_ASSIGN(TestFaviconDriver);
 };
 
 // This class is used to catch the FaviconHandler's download and history
 // request, and also provide the methods to access the FaviconHandler
 // internals.
 class TestFaviconHandler : public FaviconHandler {
  public:
   TestFaviconHandler(const GURL& page_url,
                      FaviconClient* client,
-                     FaviconDriver* driver,
+                     TestFaviconDriver* driver,
                      Type type,
                      bool download_largest_icon)
-                     : FaviconHandler(client, driver, type,
-                                      download_largest_icon),
-        entry_(NavigationEntry::Create()),
+      : FaviconHandler(client, driver, type, download_largest_icon),
         download_id_(0),
         num_favicon_updates_(0) {
-    entry_->SetURL(page_url);
+    driver->SetActiveURL(page_url);
     download_handler_.reset(new DownloadHandler(this));
   }
 
   virtual ~TestFaviconHandler() {
   }
 
   HistoryRequestHandler* history_handler() {
     return history_handler_.get();
   }
 
   // This method will take the ownership of the given handler.
   void set_history_handler(HistoryRequestHandler* handler) {
     history_handler_.reset(handler);
   }
 
   DownloadHandler* download_handler() {
     return download_handler_.get();
   }
 
   size_t num_favicon_update_notifications() const {
     return num_favicon_updates_;
   }
 
   void ResetNumFaviconUpdateNotifications() {
     num_favicon_updates_ = 0;
   }
 
   // Methods to access favicon internals.
-  virtual NavigationEntry* GetEntry() OVERRIDE {
-    return entry_.get();
-  }
-
   const std::vector<FaviconURL>& urls() {
     return image_urls_;
   }
 
   FaviconURL* current_candidate() {
     return FaviconHandler::current_candidate();
   }
 
   const FaviconCandidate& best_favicon_candidate() {
     return best_favicon_candidate_;
@@ skipping 53 matching lines @@
     return true;
   }
 
   virtual void NotifyFaviconUpdated(bool icon_url_changed) OVERRIDE {
     ++num_favicon_updates_;
   }
 
   GURL page_url_;
 
  private:
-  scoped_ptr<NavigationEntry> entry_;
 
   // The unique id of a download request. It will be returned to a
   // FaviconHandler.
   int download_id_;
 
   scoped_ptr<DownloadHandler> download_handler_;
   scoped_ptr<HistoryRequestHandler> history_handler_;
 
   // The number of times that NotifyFaviconUpdated() has been called.
   size_t num_favicon_updates_;
@@ skipping 128 matching lines @@
   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_);
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
-  EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_EQ(icon_url, helper.GetEntry()->GetFavicon().url);
+  EXPECT_TRUE(driver.GetActiveFaviconValidity());
+  EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
@@ skipping 22 matching lines @@
   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_);
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
-  EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_EQ(icon_url, helper.GetEntry()->GetFavicon().url);
+  EXPECT_TRUE(driver.GetActiveFaviconValidity());
+  EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
@@ skipping 15 matching lines @@
 
   // 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(FaviconURL::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Verify NavigationEntry.
-  content::FaviconStatus favicon_status = helper.GetEntry()->GetFavicon();
-  EXPECT_EQ(icon_url, favicon_status.url);
-  EXPECT_TRUE(favicon_status.valid);
-  EXPECT_FALSE(favicon_status.image.IsEmpty());
-  EXPECT_EQ(gfx::kFaviconSize, favicon_status.image.Width());
+  EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
+  EXPECT_TRUE(driver.GetActiveFaviconValidity());
+  EXPECT_FALSE(driver.GetActiveFaviconImage().IsEmpty());
+  EXPECT_EQ(gfx::kFaviconSize, driver.GetActiveFaviconImage().Width());
 }
 
 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");
 
   TestFaviconDriver driver;
   TestFaviconClient client;
   TestFaviconHandler helper(
       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_);
 
   // Set valid icon data.
   SetFaviconBitmapResult(icon_url, &history_handler->history_results_);
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
-  EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_EQ(icon_url, helper.GetEntry()->GetFavicon().url);
+  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);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
@@ skipping 30 matching lines @@
 
   // 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(FaviconURL::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Verify NavigationEntry.
-  content::FaviconStatus favicon_status = helper.GetEntry()->GetFavicon();
-  EXPECT_EQ(new_icon_url, favicon_status.url);
-  EXPECT_TRUE(favicon_status.valid);
-  EXPECT_FALSE(favicon_status.image.IsEmpty());
-  EXPECT_EQ(gfx::kFaviconSize, favicon_status.image.Width());
+  EXPECT_EQ(new_icon_url, driver.GetActiveFaviconURL());
+  EXPECT_TRUE(driver.GetActiveFaviconValidity());
+  EXPECT_FALSE(driver.GetActiveFaviconImage().IsEmpty());
+  EXPECT_EQ(gfx::kFaviconSize, driver.GetActiveFaviconImage().Width());
 }
 
 TEST_F(FaviconHandlerTest, FaviconInHistoryInvalid) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
 
   TestFaviconDriver driver;
   TestFaviconClient client;
   TestFaviconHandler helper(
       page_url, &client, &driver, FaviconHandler::FAVICON, false);
@@ skipping 13 matching lines @@
   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.
   history_handler->InvokeCallback();
   // The NavigationEntry should not be set yet as the history data is invalid.
-  EXPECT_FALSE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_EQ(GURL(), helper.GetEntry()->GetFavicon().url);
+  EXPECT_FALSE(driver.GetActiveFaviconValidity());
+  EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with matching favicon URL.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
@@ skipping 12 matching lines @@
 
   // 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(FaviconURL::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Verify NavigationEntry.
-  content::FaviconStatus favicon_status = helper.GetEntry()->GetFavicon();
-  EXPECT_EQ(icon_url, favicon_status.url);
-  EXPECT_TRUE(favicon_status.valid);
-  EXPECT_FALSE(favicon_status.image.IsEmpty());
-  EXPECT_EQ(gfx::kFaviconSize, favicon_status.image.Width());
+  EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
+  EXPECT_TRUE(driver.GetActiveFaviconValidity());
+  EXPECT_FALSE(driver.GetActiveFaviconImage().IsEmpty());
+  EXPECT_EQ(gfx::kFaviconSize, driver.GetActiveFaviconImage().Width());
 }
 
 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");
 
   TestFaviconDriver driver;
   TestFaviconClient client;
   TestFaviconHandler helper(
       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_);
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
-  EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_EQ(icon_url, helper.GetEntry()->GetFavicon().url);
+  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);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
@@ skipping 12 matching lines @@
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate find icon.
   SetFaviconBitmapResult(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, helper.GetEntry()->GetFavicon().url);
-  EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_FALSE(helper.GetEntry()->GetFavicon().image.IsEmpty());
+  EXPECT_EQ(new_icon_url, driver.GetActiveFaviconURL());
+  EXPECT_TRUE(driver.GetActiveFaviconValidity());
+  EXPECT_FALSE(driver.GetActiveFaviconImage().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");
 
   TestFaviconDriver driver;
   TestFaviconClient client;
   TestFaviconHandler helper(
       page_url, &client, &driver, FaviconHandler::TOUCH, 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::TOUCH_PRECOMPOSED_ICON | favicon_base::TOUCH_ICON,
             history_handler->icon_type_);
 
   // Icon not found.
   history_handler->history_results_.clear();
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
-  EXPECT_FALSE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_EQ(GURL(), helper.GetEntry()->GetFavicon().url);
+  EXPECT_FALSE(driver.GetActiveFaviconValidity());
+  EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // 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, FaviconURL::TOUCH_PRECOMPOSED_ICON, std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
@@ skipping 92 matching lines @@
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(favicon_base::TOUCH_PRECOMPOSED_ICON | favicon_base::TOUCH_ICON,
             history_handler->icon_type_);
 
   // Icon not found.
   history_handler->history_results_.clear();
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
-  EXPECT_FALSE(helper.GetEntry()->GetFavicon().valid);
-  EXPECT_EQ(GURL(), helper.GetEntry()->GetFavicon().url);
+  EXPECT_FALSE(driver.GetActiveFaviconValidity());
+  EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // 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, FaviconURL::TOUCH_PRECOMPOSED_ICON, std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
@@ skipping 111 matching lines @@
   TestFaviconDriver driver1;
   TestFaviconClient client;
   TestFaviconHandler handler1(
       kPageURL, &client, &driver1, FaviconHandler::FAVICON, false);
 
   const int kSizes1[] = { 16, 24, 32, 48, 256 };
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes1));
   DownloadTillDoneIgnoringHistory(&handler1, kPageURL, urls1, kSizes1);
 
-  content::FaviconStatus favicon_status1(handler1.GetEntry()->GetFavicon());
   EXPECT_EQ(0u, handler1.image_urls().size());
-  EXPECT_TRUE(favicon_status1.valid);
-  EXPECT_FALSE(favicon_status1.image.IsEmpty());
-  EXPECT_EQ(gfx::kFaviconSize, favicon_status1.image.Width());
+  EXPECT_TRUE(driver1.GetActiveFaviconValidity());
+  EXPECT_FALSE(driver1.GetActiveFaviconImage().IsEmpty());
+  EXPECT_EQ(gfx::kFaviconSize, driver1.GetActiveFaviconImage().Width());
 
   size_t expected_index = 2u;
   EXPECT_EQ(32, kSizes1[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url,
-            handler1.GetEntry()->GetFavicon().url);
+            driver1.GetActiveFaviconURL());
 
   // 2) Test that if there are several single resolution favicons to choose
   // from, the exact match is preferred even if it results in upsampling.
   TestFaviconDriver driver2;
   TestFaviconHandler handler2(
       kPageURL, &client, &driver2, FaviconHandler::FAVICON, false);
 
   const int kSizes2[] = { 16, 24, 48, 256 };
   std::vector<FaviconURL> urls2(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes2));
   DownloadTillDoneIgnoringHistory(&handler2, kPageURL, urls2, kSizes2);
-  EXPECT_TRUE(handler2.GetEntry()->GetFavicon().valid);
+  EXPECT_TRUE(driver2.GetActiveFaviconValidity());
   expected_index = 0u;
   EXPECT_EQ(16, kSizes2[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url,
-            handler2.GetEntry()->GetFavicon().url);
+            driver2.GetActiveFaviconURL());
 
   // 3) Test that favicons which need to be upsampled a little or downsampled
   // a little are preferred over huge favicons.
   TestFaviconDriver driver3;
   TestFaviconHandler handler3(
       kPageURL, &client, &driver3, FaviconHandler::FAVICON, false);
 
   const int kSizes3[] = { 256, 48 };
   std::vector<FaviconURL> urls3(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes3));
   DownloadTillDoneIgnoringHistory(&handler3, kPageURL, urls3, kSizes3);
-  EXPECT_TRUE(handler3.GetEntry()->GetFavicon().valid);
+  EXPECT_TRUE(driver3.GetActiveFaviconValidity());
   expected_index = 1u;
   EXPECT_EQ(48, kSizes3[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url,
-            handler3.GetEntry()->GetFavicon().url);
+            driver3.GetActiveFaviconURL());
 
   TestFaviconDriver driver4;
   TestFaviconHandler handler4(
       kPageURL, &client, &driver4, FaviconHandler::FAVICON, false);
 
   const int kSizes4[] = { 17, 256 };
   std::vector<FaviconURL> urls4(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes4));
   DownloadTillDoneIgnoringHistory(&handler4, kPageURL, urls4, kSizes4);
-  EXPECT_TRUE(handler4.GetEntry()->GetFavicon().valid);
+  EXPECT_TRUE(driver4.GetActiveFaviconValidity());
   expected_index = 0u;
   EXPECT_EQ(17, kSizes4[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url,
-            handler4.GetEntry()->GetFavicon().url);
+            driver4.GetActiveFaviconURL());
 }
 
 #endif
 
 TEST_F(FaviconHandlerTest, TestSortFavicon) {
   const GURL kPageURL("http://www.google.com");
   std::vector<gfx::Size> icon1;
   icon1.push_back(gfx::Size(1024, 1024));
   icon1.push_back(gfx::Size(512, 512));
 
@@ skipping 355 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.