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

chrome/browser/ui/webui/feedback_ui.cc

Index: chrome/browser/ui/webui/feedback_ui.cc
diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc
index 250f06a9fba21a4b16c387b5ec986e6d0c6d025c..41698682c01b91f2ce68167c135ab0cd3a16b9c4 100644
--- a/chrome/browser/ui/webui/feedback_ui.cc
+++ b/chrome/browser/ui/webui/feedback_ui.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/screenshot_source.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
@@ -304,7 +305,8 @@ void FeedbackHandler::ClobberScreenshotsSource() {
   // setting the screenshot to NULL, effectively disabling the source
   // TODO(rkc): Once there is a method to 'remove' a source, change this code
   Profile* profile = Profile::FromBrowserContext(tab_->GetBrowserContext());
-  profile->GetChromeURLDataManager()->AddDataSource(new ScreenshotSource(NULL));
+  ChromeURLDataManagerFactory::GetForProfile(profile)->
+      AddDataSource(new ScreenshotSource(NULL));
 
   FeedbackUtil::ClearScreenshotPng();
 }
@@ -317,7 +319,8 @@ void FeedbackHandler::SetupScreenshotsSource() {
   }
   // Add the source to the data manager.
   Profile* profile = Profile::FromBrowserContext(tab_->GetBrowserContext());
-  profile->GetChromeURLDataManager()->AddDataSource(screenshot_source_);
+  ChromeURLDataManagerFactory::GetForProfile(profile)->
+      AddDataSource(screenshot_source_);
 }
 
 bool FeedbackHandler::Init() {
@@ -586,7 +589,8 @@ FeedbackUI::FeedbackUI(content::WebUI* web_ui) : HtmlDialogUI(web_ui) {
 
   // Set up the chrome://feedback/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
-  profile->GetChromeURLDataManager()->AddDataSource(html_source);
+  ChromeURLDataManagerFactory::GetForProfile(profile)->
+      AddDataSource(html_source);
 }
 
 #if defined(OS_CHROMEOS)