Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/profiles/off_the_record_profile_impl.cc

Index: chrome/browser/profiles/off_the_record_profile_impl.cc
===================================================================
--- chrome/browser/profiles/off_the_record_profile_impl.cc	(revision 152958)
+++ chrome/browser/profiles/off_the_record_profile_impl.cc	(working copy)
@@ -219,6 +219,15 @@
   return NULL;
 }
 
+FaviconService* OffTheRecordProfileImpl::GetFaviconService(
+    ServiceAccessType sat) {
+  if (sat == EXPLICIT_ACCESS)
+    return profile_->GetFaviconService(sat);
+
+  NOTREACHED() << "This profile is OffTheRecord";
+  return NULL;
+}
+
 policy::UserCloudPolicyManager*
     OffTheRecordProfileImpl::GetUserCloudPolicyManager() {
   return profile_->GetUserCloudPolicyManager();
Property changes on: chrome/browser/profiles/off_the_record_profile_impl.cc
___________________________________________________________________
Deleted: svn:mergeinfo