Make the id used in IconMsg_DownloadFavicon unique

chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.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/ui/views/ash/launcher/launcher_favicon_loader.h"
 
 #include "base/logging.h"
+#include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/common/favicon_url.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"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace internal {
@@ skipping 81 matching lines @@
     if (processed_requests_.find(*iter) != processed_requests_.end())
       continue;  // Skip already processed downloads.
     if (pending_requests_.find(*iter) != pending_requests_.end())
       continue;  // Skip already pending downloads.
     DownloadFavicon(*iter);
   }
 }
 
 void FaviconBitmapHandler::DownloadFavicon(const GURL& image_url) {
   int image_size = 0;  // Request the full sized image.
-  static int next_id = 1;
-  int id = next_id++;
   pending_requests_.insert(image_url);
   content::RenderViewHost* host = web_contents_->GetRenderViewHost();
-  host->Send(new IconMsg_DownloadFavicon(
-      host->GetRoutingID(), id, image_url, image_size));
+  FaviconUtil::DownloadFavicon(host, image_url, image_size);
 }
 
 void FaviconBitmapHandler::OnDidDownloadFavicon(int id,
                                                 const GURL& image_url,
                                                 bool errored,
                                                 const SkBitmap& bitmap) {
   UrlSet::iterator iter = pending_requests_.find(image_url);
   if (iter == pending_requests_.end()) {
     // Updates are received for all downloads; ignore unrequested urls.
     return;
@@ skipping 55 matching lines @@
     const std::vector<FaviconURL>& candidates) {
   favicon_handler_->OnUpdateFaviconURL(page_id, candidates);
 }
 
 void LauncherFaviconLoader::OnDidDownloadFavicon(int id,
                                                  const GURL& image_url,
                                                  bool errored,
                                                  const SkBitmap& bitmap) {
   favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, bitmap);
 }