Refactor FaviconDriver::OnFaviconAvailable()

chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc

Index: chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc
diff --git a/chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc b/chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc
index 6ff3bbfa936c5adb65b63ec95f9a14302e834735..01b139a45198344f842cd716c32284674a957093 100644
--- a/chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc
+++ b/chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc
@@ -72,7 +72,7 @@ class FaviconWaiter : public favicon::FaviconDriverObserver {
   }
 
   void WaitForFaviconWithURL(const GURL& url) {
-    if (driver_->GetActiveFaviconURL() == url) {
+    if (driver_->GetFaviconURL() == url) {
       driver_->RemoveObserver(this);
       return;
     }
@@ -84,11 +84,13 @@ class FaviconWaiter : public favicon::FaviconDriverObserver {
   }
 
  private:
-  void OnFaviconAvailable(const gfx::Image& image) override {}
-
-  void OnFaviconUpdated(favicon::FaviconDriver* driver,
-                        bool icon_url_changed) override {
-    if (driver_->GetActiveFaviconURL() == target_favicon_url_) {
+  void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
+                        NotificationIconType notification_icon_type,
+                        const GURL& icon_url,
+                        bool icon_url_changed,
+                        const gfx::Image& image) override {
+    if (notification_icon_type == NON_TOUCH_16_DIP &&
+        icon_url == target_favicon_url_) {
       driver_->RemoveObserver(this);
 
       if (!quit_closure_.is_null())