Move the FaviconClient implementation to ChromeFaviconClient.

chrome/browser/favicon/favicon_tab_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_tab_helper.h"
 
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/favicon/chrome_favicon_client.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
-#include "components/bookmarks/browser/bookmark_model.h"
 #include "components/favicon_base/favicon_types.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.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 "content/public/common/favicon_url.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 
 using content::FaviconStatus;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(FaviconTabHelper);
 
 FaviconTabHelper::FaviconTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())) {
+  client_.reset(new ChromeFaviconClient(profile_));
 #if defined(OS_ANDROID)
   bool download_largest_icon = true;
 #else
   bool download_largest_icon = false;
 #endif
-  favicon_handler_.reset(
-      new FaviconHandler(this, this, FaviconHandler::FAVICON,
-                         download_largest_icon));
+  favicon_handler_.reset(new FaviconHandler(client_.get(),
+                                            this,
+                                            FaviconHandler::FAVICON,
+                                            download_largest_icon));
   if (chrome::kEnableTouchIcon)
-    touch_icon_handler_.reset(
-        new FaviconHandler(this, this, FaviconHandler::TOUCH,
-                           download_largest_icon));
+    touch_icon_handler_.reset(new FaviconHandler(client_.get(),
+                                                 this,
+                                                 FaviconHandler::TOUCH,
+                                                 download_largest_icon));
 }
 
 FaviconTabHelper::~FaviconTabHelper() {
 }
 
 void FaviconTabHelper::FetchFavicon(const GURL& url) {
   favicon_handler_->FetchFavicon(url);
   if (touch_icon_handler_.get())
     touch_icon_handler_->FetchFavicon(url);
 }
@@ skipping 186 matching lines @@
     favicon_urls.push_back(
         favicon::FaviconURL(candidate.icon_url,
                             ToChromeIconType(candidate.icon_type),
                             candidate.icon_sizes));
   }
   favicon_handler_->OnUpdateFaviconURL(favicon_urls);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnUpdateFaviconURL(favicon_urls);
 }
 
-FaviconService* FaviconTabHelper::GetFaviconService() {
-  return FaviconServiceFactory::GetForProfile(profile_,
-                                              Profile::EXPLICIT_ACCESS);
-}
-
-bool FaviconTabHelper::IsBookmarked(const GURL& url) {
-  BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_);
-  return bookmark_model && bookmark_model->IsBookmarked(url);
-}
-
 void FaviconTabHelper::DidDownloadFavicon(
     int id,
     int http_status_code,
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
 
   if (bitmaps.empty() && http_status_code == 404) {
     DVLOG(1) << "Failed to Download Favicon:" << image_url;
     FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
         profile_->GetOriginalProfile(), Profile::IMPLICIT_ACCESS);
     if (favicon_service)
       favicon_service->UnableToDownloadFavicon(image_url);
   }
 
   favicon_handler_->OnDidDownloadFavicon(
       id, image_url, bitmaps, original_bitmap_sizes);
   if (touch_icon_handler_.get()) {
     touch_icon_handler_->OnDidDownloadFavicon(
         id, image_url, bitmaps, original_bitmap_sizes);
   }
 }