Remove FaviconUtil::DownloadFavicon

chrome/browser/favicon/favicon_download_helper.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 "chrome/browser/favicon/favicon_download_helper.h"
 
 #include "chrome/browser/favicon/favicon_download_helper_delegate.h"
-#include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 using content::WebContents;
 
+namespace {
+  static int current_download_id = 0;
+} // namespace.

[stevenjb, 2012/11/26 18:21:58]

nit: extra space before // (or omit comment for short anon namespace)
Also, I think that a function static is probably preferable here.

[Cait (Slow), 2012/11/26 23:37:19]

Done.

+
 FaviconDownloadHelper::FaviconDownloadHelper(
     WebContents* web_contents,
     FaviconDownloadHelperDelegate* delegate)
     : content::WebContentsObserver(web_contents),
       delegate_(delegate) {
   DCHECK(delegate_);
 }
 
 FaviconDownloadHelper::~FaviconDownloadHelper() {
 }
 
 int FaviconDownloadHelper::DownloadFavicon(const GURL& url, int image_size) {
   content::RenderViewHost* host = web_contents()->GetRenderViewHost();
-  int id = FaviconUtil::DownloadFavicon(host, url, image_size);
+  int id = ++current_download_id;
+  host->Send(new IconMsg_DownloadFavicon(host->GetRoutingID(), id, url,
+                                         image_size));
   DownloadIdList::iterator i =
       std::find(download_ids_.begin(), download_ids_.end(), id);
   DCHECK(i == download_ids_.end());
   download_ids_.insert(id);
   return id;
 }
 
 bool FaviconDownloadHelper::OnMessageReceived(const IPC::Message& message) {
   bool message_handled = false;   // Allow other handlers to receive these.
   IPC_BEGIN_MESSAGE_MAP(FaviconDownloadHelper, message)
@@ skipping 20 matching lines @@
   delegate_->OnDidDownloadFavicon(
       id, image_url, errored, requested_size, bitmaps);
   download_ids_.erase(i);
 }
 
 void FaviconDownloadHelper::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& candidates) {
   delegate_->OnUpdateFaviconURL(page_id, candidates);
 }