Refactor FaviconDriver::OnFaviconAvailable()

chrome/browser/favicon/content_favicon_driver_browsertest.cc

 // Copyright 2015 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 "components/favicon/content/content_favicon_driver.h"
 
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/scoped_observer.h"
@@ skipping 124 matching lines @@
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override {
     if (type == content::NOTIFICATION_LOAD_STOP)
       load_stopped_ = true;
 
     OnNotification();
   }
 
   // favicon::Favicon
-  void OnFaviconAvailable(const gfx::Image& image) override {}
   void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
-                        bool icon_url_changed) override {
+                        NotificationIconType notification_icon_type,
+                        const GURL& icon_url,
+                        bool icon_url_changed,
+                        const gfx::Image& image) override {
     OnNotification();
   }
 
   void OnNotification() {
     if (!quit_closure_.is_null()) {
       // We stop waiting based on changes in state to FaviconHandler which occur
       // immediately after OnFaviconUpdated() is called. Post a task to check if
       // we can stop waiting.
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(&PendingTaskWaiter::EndLoopIfCanStopWaiting,
@@ skipping 79 matching lines @@
 
   // A reload ignoring the cache should refetch the favicon from the website.
   {
     PendingTaskWaiter waiter(web_contents(), this);
     chrome::ExecuteCommand(browser(), IDC_RELOAD_IGNORING_CACHE);
     waiter.Wait();
   }
   ASSERT_TRUE(delegate->was_requested());
   EXPECT_TRUE(delegate->bypassed_cache());
 }