Taking over issue 10006037: Moved WebDataService to ProfileKeyedService

chrome/browser/intents/web_intents_registry_factory.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/intents/web_intents_registry_factory.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #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) {
   return static_cast<WebIntentsRegistry*>(
       GetInstance()->GetServiceForProfile(profile, true));
 }
 
 WebIntentsRegistryFactory::WebIntentsRegistryFactory()
     : ProfileKeyedServiceFactory("WebIntentsRegistry",
                                  ProfileDependencyManager::GetInstance()) {
-  // TODO(erg): For Shutdown() order, we need to:
-  //     DependsOn(WebDataServiceFactory::GetInstance());
+  DependsOn(WebDataServiceFactory::GetInstance());
   DependsOn(ExtensionSystemFactory::GetInstance());
 }
 
 WebIntentsRegistryFactory::~WebIntentsRegistryFactory() {
 }
 
 // static
 WebIntentsRegistryFactory* WebIntentsRegistryFactory::GetInstance() {
   return Singleton<WebIntentsRegistryFactory>::get();
 }
 
 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;
 }
 
 bool WebIntentsRegistryFactory::ServiceRedirectedInIncognito() {
   return false;
 }