Revert 276642 "Turn FaviconClient into a Keyed service."

trunk/src/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/chrome_notification_types.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
-#include "chrome/browser/favicon/chrome_favicon_client_factory.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"
@@ skipping 16 matching lines @@
 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_ = ChromeFaviconClientFactory::GetForProfile(profile_);
+  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(
-      client_, 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(
-        client_, 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 208 matching lines @@
       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);
   }
 }