Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele…

chrome/browser/ui/webui/ntp/new_tab_ui.cc

Index: chrome/browser/ui/webui/ntp/new_tab_ui.cc
===================================================================
--- chrome/browser/ui/webui/ntp/new_tab_ui.cc	(revision 176443)
+++ chrome/browser/ui/webui/ntp/new_tab_ui.cc	(working copy)
@@ -362,10 +362,13 @@
 // NewTabHTMLSource
 
 NewTabUI::NewTabHTMLSource::NewTabHTMLSource(Profile* profile)
-    : DataSource(chrome::kChromeUINewTabHost, MessageLoop::current()),
-      profile_(profile) {
+    : profile_(profile) {
 }
 
+std::string NewTabUI::NewTabHTMLSource::GetSource() {
+  return chrome::kChromeUINewTabHost;
+}
+
 void NewTabUI::NewTabHTMLSource::StartDataRequest(const std::string& path,
                                                   bool is_incognito,
                                                   int request_id) {
@@ -379,7 +382,7 @@
             ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
                 it->second.second) :
             new base::RefCountedStaticMemory);
-    SendResponse(request_id, resource_bytes);
+    url_data_source()->SendResponse(request_id, resource_bytes);
     return;
   }
 
@@ -401,7 +404,7 @@
       NTPResourceCacheFactory::GetForProfile(profile_)->
       GetNewTabHTML(is_incognito));
 
-  SendResponse(request_id, html_bytes);
+  url_data_source()->SendResponse(request_id, html_bytes);
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string& resource)