Remove NOTIFICATION_FAVICON_UPDATED

chrome/browser/favicon/favicon_tab_helper_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 "chrome/browser/favicon/favicon_tab_helper.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
+#include "base/scoped_observer.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/favicon/core/favicon_driver_observer.h"
 #include "components/favicon/core/favicon_handler.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "net/base/load_flags.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/url_request.h"
 #include "url/url_constants.h"
@@ skipping 66 matching lines @@
  public:
   virtual ~FaviconTabHelperPendingTaskChecker() {}
 
   virtual bool HasPendingTasks() = 0;
 };
 
 // Waits for the following the finish:
 // - The pending navigation.
 // - FaviconHandler's pending favicon database requests.
 // - FaviconHandler's pending downloads.
-class PendingTaskWaiter : public content::NotificationObserver {
+class PendingTaskWaiter : public content::NotificationObserver,
+                          public favicon::FaviconDriverObserver {
  public:
   PendingTaskWaiter(content::WebContents* web_contents,
                     FaviconTabHelperPendingTaskChecker* checker)
-      : checker_(checker), load_stopped_(false), weak_factory_(this) {
-    registrar_.Add(this, chrome::NOTIFICATION_FAVICON_UPDATED,
-                   content::Source<content::WebContents>(web_contents));
+      : checker_(checker),
+        load_stopped_(false),
+        scoped_observer_(this),
+        weak_factory_(this) {
     registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
                    content::Source<content::NavigationController>(
                        &web_contents->GetController()));
+    scoped_observer_.Add(FaviconTabHelper::FromWebContents(web_contents));
   }
   ~PendingTaskWaiter() override {}
 
   void Wait() {
     if (load_stopped_ && !checker_->HasPendingTasks())
       return;
 
     base::RunLoop run_loop;
     quit_closure_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 
  private:
   // content::NotificationObserver:
   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 {
+    OnNotification();
+  }
+
+  void OnNotification() {
     if (!quit_closure_.is_null()) {
       // We stop waiting based on changes in state to FaviconHandler which occur
-      // immediately after NOTIFICATION_FAVICON_UPDATED is sent. Post a task to
-      // check if we can stop waiting.
+      // immediately after OnFaviconUpdated() is called. Post a task to check if
+      // we can stop waiting.
       base::MessageLoopForUI::current()->PostTask(
           FROM_HERE, base::Bind(&PendingTaskWaiter::EndLoopIfCanStopWaiting,
                                 weak_factory_.GetWeakPtr()));
     }
   }
 
   void EndLoopIfCanStopWaiting() {
     if (!quit_closure_.is_null() &&
         load_stopped_ &&
         !checker_->HasPendingTasks()) {
       quit_closure_.Run();
     }
   }
 
   FaviconTabHelperPendingTaskChecker* checker_;  // Not owned.
   bool load_stopped_;
   base::Closure quit_closure_;
   content::NotificationRegistrar registrar_;
+  ScopedObserver<FaviconTabHelper, PendingTaskWaiter> scoped_observer_;
   base::WeakPtrFactory<PendingTaskWaiter> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PendingTaskWaiter);
 };
 
 }  // namespace
 
 class FaviconTabHelperTest : public InProcessBrowserTest,
                              public FaviconTabHelperPendingTaskChecker {
  public:
@@ skipping 55 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());
 }