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

chrome/browser/ui/webui/conflicts_ui.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/ui/webui/conflicts_ui.h"
 
 #if defined(OS_WIN)
 
 #include <string>
 
@@ skipping 149 matching lines @@
 // ConflictsUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   content::RecordAction(UserMetricsAction("ViewAboutConflicts"));
   web_ui->AddMessageHandler(new ConflictsDOMHandler());
 
   // Set up the about:conflicts source.
   Profile* profile = Profile::FromWebUI(web_ui);
-  profile->GetChromeURLDataManager()->AddDataSource(
-      CreateConflictsUIHTMLSource());
+  ChromeURLDataManager::AddDataSource(profile, CreateConflictsUIHTMLSource());
 }
 
 // static
 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
   return static_cast<RefCountedMemory*>(ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_CONFLICT_FAVICON));
 }
 
 #endif