Renamed FaviconHandlerDelegate to FaviconDriver.

chrome/browser/favicon/favicon_handler.cc

Index: chrome/browser/favicon/favicon_handler.cc
diff --git a/chrome/browser/favicon/favicon_handler.cc b/chrome/browser/favicon/favicon_handler.cc
index 08487e0e38d3228b661ab9dc9e83d6c6df9fa28b..1822cd1654bf4afcb2b1fc99a0c4dc059ebe48ca 100644
--- a/chrome/browser/favicon/favicon_handler.cc
+++ b/chrome/browser/favicon/favicon_handler.cc
@@ -241,7 +241,7 @@ FaviconHandler::FaviconCandidate::FaviconCandidate(
 ////////////////////////////////////////////////////////////////////////////////
 
 FaviconHandler::FaviconHandler(FaviconClient* client,
-                               FaviconHandlerDelegate* delegate,
+                               FaviconDriver* driver,
                                Type icon_type,
                                bool download_largest_icon)
     : got_favicon_from_history_(false),
@@ -252,8 +252,8 @@ FaviconHandler::FaviconHandler(FaviconClient* client,
                             favicon_base::TOUCH_PRECOMPOSED_ICON),
       download_largest_icon_(download_largest_icon),
       client_(client),
-      delegate_(delegate) {
-  DCHECK(delegate_);
+      driver_(driver) {
+  DCHECK(driver_);
 }
 
 FaviconHandler::~FaviconHandler() {
@@ -495,7 +495,7 @@ void FaviconHandler::OnDidDownloadFavicon(
 }
 
 NavigationEntry* FaviconHandler::GetEntry() {
-  NavigationEntry* entry = delegate_->GetActiveEntry();
+  NavigationEntry* entry = driver_->GetActiveEntry();
   if (entry && UrlMatches(entry->GetURL(), url_))
     return entry;
 
@@ -510,7 +510,7 @@ int FaviconHandler::DownloadFavicon(const GURL& image_url,
     NOTREACHED();
     return 0;
   }
-  return delegate_->StartDownload(image_url, max_bitmap_size);
+  return driver_->StartDownload(image_url, max_bitmap_size);
 }
 
 void FaviconHandler::UpdateFaviconMappingAndFetch(
@@ -557,7 +557,7 @@ void FaviconHandler::SetHistoryFavicons(const GURL& page_url,
 }
 
 bool FaviconHandler::ShouldSaveFavicon(const GURL& url) {
-  if (!delegate_->IsOffTheRecord())
+  if (!driver_->IsOffTheRecord())
     return true;
 
   // Otherwise store the favicon if the page is bookmarked.
@@ -565,7 +565,7 @@ bool FaviconHandler::ShouldSaveFavicon(const GURL& url) {
 }
 
 void FaviconHandler::NotifyFaviconUpdated(bool icon_url_changed) {
-  delegate_->NotifyFaviconUpdated(icon_url_changed);
+  driver_->NotifyFaviconUpdated(icon_url_changed);
 }
 
 void FaviconHandler::OnFaviconDataForInitialURLFromFaviconService(
@@ -633,7 +633,7 @@ void FaviconHandler::DownloadFaviconOrAskFaviconService(
     // We don't know the favicon, but we may have previously downloaded the
     // favicon for another page that shares the same favicon. Ask for the
     // favicon given the favicon URL.
-    if (delegate_->IsOffTheRecord()) {
+    if (driver_->IsOffTheRecord()) {
       GetFaviconFromFaviconService(
           icon_url, icon_type,
           base::Bind(&FaviconHandler::OnFaviconData, base::Unretained(this)),
@@ -689,7 +689,7 @@ int FaviconHandler::ScheduleDownload(const GURL& url,
                                      const GURL& image_url,
                                      favicon_base::IconType icon_type) {
   // A max bitmap size is specified to avoid receiving huge bitmaps in
-  // OnDidDownloadFavicon(). See FaviconHandlerDelegate::StartDownload()
+  // OnDidDownloadFavicon(). See FaviconDriver::StartDownload()
   // for more details about the max bitmap size.
   const int download_id = DownloadFavicon(image_url,
                                           GetMaximalIconSize(icon_type));