Taking over issue 10006037: Moved WebDataService to ProfileKeyedService

chrome/browser/intents/web_intents_registry_factory.cc

Index: chrome/browser/intents/web_intents_registry_factory.cc
===================================================================
--- chrome/browser/intents/web_intents_registry_factory.cc	(revision 136024)
+++ chrome/browser/intents/web_intents_registry_factory.cc	(working copy)
@@ -9,6 +9,7 @@
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 
 // static
 WebIntentsRegistry* WebIntentsRegistryFactory::GetForProfile(Profile* profile) {
@@ -19,8 +20,7 @@
 WebIntentsRegistryFactory::WebIntentsRegistryFactory()
     : ProfileKeyedServiceFactory("WebIntentsRegistry",
                                  ProfileDependencyManager::GetInstance()) {
-  // TODO(erg): For Shutdown() order, we need to:
-  //     DependsOn(WebDataServiceFactory::GetInstance());
+  DependsOn(WebDataServiceFactory::GetInstance());
   DependsOn(ExtensionSystemFactory::GetInstance());
 }
 
@@ -35,7 +35,8 @@
 ProfileKeyedService* WebIntentsRegistryFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   WebIntentsRegistry* registry = new WebIntentsRegistry;
-  registry->Initialize(profile->GetWebDataService(Profile::EXPLICIT_ACCESS),
+  registry->Initialize(WebDataServiceFactory::GetForProfile(
+                           profile, Profile::EXPLICIT_ACCESS),
                        profile->GetExtensionService());
   return registry;
 }