Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/favicon/favicon_service_factory.h

Index: chrome/browser/favicon/favicon_service_factory.h
===================================================================
--- chrome/browser/favicon/favicon_service_factory.h	(revision 152958)
+++ chrome/browser/favicon/favicon_service_factory.h	(working copy)
@@ -1,42 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_
-
-#include "base/memory/singleton.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_keyed_service_factory.h"
-
-template <typename T> struct DefaultSingletonTraits;
-
-class Profile;
-class FaviconService;
-
-// Singleton that owns all FaviconService and associates them with
-// Profiles.
-class FaviconServiceFactory : public ProfileKeyedServiceFactory {
- public:
-  // |access| defines what the caller plans to do with the service. See
-  // the ServiceAccessType definition in profile.h.
-  static FaviconService* GetForProfile(Profile* profile,
-                                       Profile::ServiceAccessType sat);
-
-  static FaviconServiceFactory* GetInstance();
-
- private:
-  friend struct DefaultSingletonTraits<FaviconServiceFactory>;
-
-  FaviconServiceFactory();
-  virtual ~FaviconServiceFactory();
-
-  // ProfileKeyedServiceFactory:
-  virtual ProfileKeyedService* BuildServiceInstanceFor(
-      Profile* profile) const OVERRIDE;
-  virtual bool ServiceIsNULLWhileTesting() OVERRIDE;
-
-  DISALLOW_COPY_AND_ASSIGN(FaviconServiceFactory);
-};
-
-#endif  // CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_