Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/ui/toolbar/back_forward_menu_model_unittest.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/toolbar/back_forward_menu_model.h"
 
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 501 matching lines @@
   GURL url1_favicon("http://www.a.com/1/favicon.ico");
 
   NavigateAndCommit(url1);
   // Navigate to a new URL so that url1 will be in the BackForwardMenuModel.
   NavigateAndCommit(url2);
 
   // Set the desired favicon for url1.
   HistoryServiceFactory::GetForProfile(
       profile(), Profile::EXPLICIT_ACCESS)->AddPage(
           url1, history::SOURCE_BROWSED);
-  FaviconServiceFactory::GetForProfile(
-      profile(), Profile::EXPLICIT_ACCESS)->SetFavicon(
-          url1, url1_favicon, icon_data, history::FAVICON);
+  profile()->GetFaviconService(Profile::EXPLICIT_ACCESS)->SetFavicon(url1,
+      url1_favicon, icon_data, history::FAVICON);
 
   // Will return the current icon (default) but start an anync call
   // to retrieve the favicon from the favicon service.
   gfx::Image default_icon;
   back_model.GetIconAt(0, &default_icon);
 
   // Make the favicon service run GetFavIconForURL,
   // FaviconDelegate.OnIconChanged will be called.
   MessageLoop::current()->Run();
 
@@ skipping 18 matching lines @@
   // Verify we did get the expected favicon.
   EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(),
                       valid_icon_bitmap.getPixels(),
                       new_icon_bitmap.getSize()));
 
   // Make sure the browser deconstructor doesn't have problems.
   chrome::CloseAllTabs(browser.get());
   // This is required to prevent the message loop from hanging.
   profile()->DestroyHistoryService();
 }