Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it.

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 7d26924df929de1a9102248ef2297d5aa1eaa7cb..325a634247f7e0a2cc309892d62b3cce6051ccce 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -40,7 +40,6 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ -680,14 +679,6 @@ void TestingProfile::BlockUntilHistoryProcessesPendingRequests() {
   MessageLoop::current()->Run();
 }
 
-ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() {
-  if (!chrome_url_data_manager_.get())
-    chrome_url_data_manager_.reset(
-        new ChromeURLDataManager(
-            base::Callback<ChromeURLDataManagerBackend*(void)>()));
-  return chrome_url_data_manager_.get();
-}
-
 chrome_browser_net::Predictor* TestingProfile::GetNetworkPredictor() {
   return NULL;
 }
@@ -718,3 +709,8 @@ void TestingProfile::DestroyWebDataService() {
 bool TestingProfile::WasCreatedByVersionOrLater(const std::string& version) {
   return true;
 }
+
+base::Callback<ChromeURLDataManagerBackend*(void)>
+    TestingProfile::GetChromeURLDataManagerBackendGetter() const {
+  return base::Callback<ChromeURLDataManagerBackend*(void)>();
+}