Move favicon callbacks to favicon_base

chrome/browser/bookmarks/chrome_bookmark_client.cc

 // Copyright 2014 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/bookmarks/chrome_bookmark_client.h"
 
 #include "base/logging.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_changed_details.h"
 #include "chrome/browser/favicon/favicon_service.h"
@@ skipping 42 matching lines @@
   return false;
 #else
   return true;
 #endif
 }
 
 base::CancelableTaskTracker::TaskId ChromeBookmarkClient::GetFaviconImageForURL(
     const GURL& page_url,
     int icon_types,
     int desired_size_in_dip,
-    const FaviconImageCallback& callback,
+    const favicon_base::FaviconImageCallback& callback,
     base::CancelableTaskTracker* tracker) {
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service)
     return base::CancelableTaskTracker::kBadTaskId;
   return favicon_service->GetFaviconImageForURL(
       FaviconService::FaviconForURLParams(
           page_url, icon_types, desired_size_in_dip),
       callback,
       tracker);
@@ skipping 71 matching lines @@
     const BookmarkNode* node,
     const std::set<GURL>& removed_urls) {
   NotifyHistoryOfRemovedURLs(profile_, removed_urls);
 }
 
 void ChromeBookmarkClient::BookmarkAllNodesRemoved(
     BookmarkModel* model,
     const std::set<GURL>& removed_urls) {
   NotifyHistoryOfRemovedURLs(profile_, removed_urls);
 }