Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now...

chrome/browser/profiles/profile_keyed_service_factory.cc

Index: chrome/browser/profiles/profile_keyed_service_factory.cc
===================================================================
--- chrome/browser/profiles/profile_keyed_service_factory.cc	(revision 81278)
+++ chrome/browser/profiles/profile_keyed_service_factory.cc	(working copy)
@@ -13,7 +13,7 @@
 
 ProfileKeyedServiceFactory::ProfileKeyedServiceFactory(
     ProfileDependencyManager* manager)
-    : dependency_manager_(manager), factory_(NULL) {
+    : dependency_manager_(manager) {
   dependency_manager_->AddComponent(this);
 }
 
@@ -35,22 +35,12 @@
     }
   }
 
-  ProfileKeyedService* service;
-
   std::map<Profile*, ProfileKeyedService*>::iterator it =
       mapping_.find(profile);
-  if (it != mapping_.end()) {
-    service = it->second;
-    if (service || !factory_)
-      return service;
+  if (it != mapping_.end())
+    return it->second;
 
-    // service is NULL but we have a mock factory function
-    mapping_.erase(it);
-    service = factory_(profile);
-  } else {
-    service = BuildServiceInstanceFor(profile);
-  }
-
+  ProfileKeyedService* service = BuildServiceInstanceFor(profile);
   Associate(profile, service);
   return service;
 }
@@ -76,7 +66,7 @@
 void ProfileKeyedServiceFactory::ProfileShutdown(Profile* profile) {
   std::map<Profile*, ProfileKeyedService*>::iterator it =
       mapping_.find(profile);
-  if (it != mapping_.end() && it->second)
+  if (it != mapping_.end())
     it->second->Shutdown();
 }