move favicon download code from chrome/ into content/

chrome/browser/ui/ash/launcher/launcher_favicon_loader_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 <vector>
 
 #include "base/file_path.h"
+#include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/common/favicon_url.h"
-#include "chrome/common/icon_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/favicon_url.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::FaviconURL;
+
 namespace {
 
 // Observer class to determine when favicons have completed loading.
 class ContentsObserver : public content::WebContentsObserver {
  public:
   explicit ContentsObserver(content::WebContents* web_contents)
       : content::WebContentsObserver(web_contents),
         got_favicons_(false) {
   }
 
   virtual ~ContentsObserver() {}
 
   bool got_favicons() const { return got_favicons_; }
   void Reset() {
     got_favicons_ = false;
   }
 
   // content::WebContentsObserver overrides.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
-    bool message_handled = false;   // Allow other handlers to receive these.
-    IPC_BEGIN_MESSAGE_MAP(ContentsObserver, message)
-      IPC_MESSAGE_HANDLER(IconHostMsg_UpdateFaviconURL, OnUpdateFaviconURL)
-      IPC_MESSAGE_UNHANDLED(message_handled = false)
-    IPC_END_MESSAGE_MAP()
-    return message_handled;
-  }
-
- private:
-  void OnUpdateFaviconURL(int32 page_id,
-                          const std::vector<FaviconURL>& candidates) {
+  virtual void DidUpdateFaviconURL(int32 page_id,
+      const std::vector<FaviconURL>& candidates) OVERRIDE {
     if (!candidates.empty())
       got_favicons_ = true;
   }
 
+ private:
   bool got_favicons_;
 };
 
 }  // namespace
 
 class LauncherFaviconLoaderBrowsertest : public InProcessBrowserTest {
  public:
   LauncherFaviconLoaderBrowsertest()
     : panel_browser_(NULL),
       loader_(NULL),
@@ skipping 120 matching lines @@
   NavigateTo("launcher-smallfavicon.html");
   EXPECT_TRUE(WaitForFaviconDownloads());
   EXPECT_TRUE(favicon_loader->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   NavigateTo("launcher-largefavicon.html");
   EXPECT_TRUE(WaitForFaviconDownloads());
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader->GetFavicon().height());
 }