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

chrome/browser/ui/webui/options2/options_ui2.cc

Index: chrome/browser/ui/webui/options2/options_ui2.cc
diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc
index a0adc59a37286169a8ac600891949ef6c22dfe37..fc4de4999f53bbdb8ac08ba842ab9a8a632495e0 100644
--- a/chrome/browser/ui/webui/options2/options_ui2.cc
+++ b/chrome/browser/ui/webui/options2/options_ui2.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"
 #include "chrome/browser/ui/webui/options2/autofill_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler2.h"
@@ -298,17 +299,19 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)
 
   // Set up the chrome://settings-frame/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
-  profile->GetChromeURLDataManager()->AddDataSource(html_source);
+  ChromeURLDataManagerFactory::GetForProfile(profile)->
+      AddDataSource(html_source);
 
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
-  profile->GetChromeURLDataManager()->AddDataSource(theme);
+  ChromeURLDataManagerFactory::GetForProfile(profile)->AddDataSource(theme);
 
 #if defined(OS_CHROMEOS)
   // Set up the chrome://userimage/ source.
   chromeos::options2::UserImageSource* user_image_source =
       new chromeos::options2::UserImageSource();
-  profile->GetChromeURLDataManager()->AddDataSource(user_image_source);
+  ChromeURLDataManagerFactory::GetForProfile(profile)->
+      AddDataSource(user_image_source);
 
   pointer_device_observer_.reset(
       new chromeos::system::PointerDeviceObserver());