Remove NOTIFICATION_FAVICON_UPDATED

chrome/browser/prerender/prerender_browsertest.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 <deque>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
+#include "base/scoped_observer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/test_timeouts.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
 #include "chrome/browser/chrome_content_browser_client.h"
@@ skipping 32 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/favicon/core/favicon_driver_observer.h"
 #include "components/variations/entropy_provider.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 45 matching lines @@
 // the page behaves as expected when prerendered.
 //
 // The prerendered page is then displayed on a tab.  The Javascript function
 // DidDisplayPass() is called, and returns true if the page behaved as it
 // should while being displayed.
 
 namespace prerender {
 
 namespace {
 
+class FaviconUpdateWatcher : public favicon::FaviconDriverObserver {
+ public:
+  explicit FaviconUpdateWatcher(content::WebContents* web_contents)
+      : seen_(false), running_(false), scoped_observer_(this) {
+    scoped_observer_.Add(FaviconTabHelper::FromWebContents(web_contents));
+  }
+
+  void Wait() {
+    if (seen_)
+      return;
+
+    running_ = true;
+    message_loop_runner_ = new content::MessageLoopRunner;
+    message_loop_runner_->Run();
+  }
+
+ private:
+  void OnFaviconAvailable(const gfx::Image& image) override {}
+  void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
+                        bool icon_url_changed) override {
+    seen_ = true;
+    if (!running_)
+      return;
+
+    message_loop_runner_->Quit();
+    running_ = false;
+  }
+
+  bool seen_;
+  bool running_;
+  ScopedObserver<FaviconTabHelper, FaviconUpdateWatcher> scoped_observer_;
+  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
+
+  DISALLOW_COPY_AND_ASSIGN(FaviconUpdateWatcher);
+};
+
 class MockNetworkChangeNotifierWIFI : public NetworkChangeNotifier {
  public:
   ConnectionType GetCurrentConnectionType() const override {
     return NetworkChangeNotifier::CONNECTION_WIFI;
   }
 };
 
 class MockNetworkChangeNotifier4G : public NetworkChangeNotifier {
  public:
   ConnectionType GetCurrentConnectionType() const override {
@@ skipping 2995 matching lines @@
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderFavicon) {
   scoped_ptr<TestPrerender> prerender =
       PrerenderTestURL("files/prerender/prerender_favicon.html",
                        FINAL_STATUS_USED,
                        1);
   NavigateToDestURL();
 
   if (!FaviconTabHelper::FromWebContents(
           GetActiveWebContents())->FaviconIsValid()) {
     // If the favicon has not been set yet, wait for it to be.
-    content::WindowedNotificationObserver favicon_update_watcher(
-        chrome::NOTIFICATION_FAVICON_UPDATED,
-        content::Source<WebContents>(GetActiveWebContents()));
+    FaviconUpdateWatcher favicon_update_watcher(GetActiveWebContents());
     favicon_update_watcher.Wait();
   }
   EXPECT_TRUE(FaviconTabHelper::FromWebContents(
       GetActiveWebContents())->FaviconIsValid());
 }
 
 // Checks that when a prerendered page is swapped in to a referring page, the
 // unload handlers on the referring page are executed.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderUnload) {
   // Matches URL in prerender_loader_with_unload.html.
@@ skipping 952 matching lines @@
   TestShouldDisableLocalPredictorPreferenceNetworkMatrix(
       false /*preference_wifi_network_wifi*/,
       false /*preference_wifi_network_4g*/,
       false /*preference_always_network_wifi*/,
       false /*preference_always_network_4g*/,
       false /*preference_never_network_wifi*/,
       false /*preference_never_network_4g*/);
 }
 
 }  // namespace prerender