Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa…

chrome/browser/ui/webui/downloads_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/downloads_ui.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/singleton.h"
 #include "base/string_piece.h"
 #include "base/threading/thread.h"
@@ skipping 57 matching lines @@
   source->AddLocalizedString("control_retry", IDS_DOWNLOAD_LINK_RETRY);
   source->AddLocalizedString("control_cancel", IDS_DOWNLOAD_LINK_CANCEL);
   source->AddLocalizedString("control_resume", IDS_DOWNLOAD_LINK_RESUME);
   source->AddLocalizedString("control_removefromlist",
                              IDS_DOWNLOAD_LINK_REMOVE);
 
   source->set_json_path("strings.js");
   source->add_resource_path("downloads.css", IDR_DOWNLOADS_CSS);
   source->add_resource_path("downloads.js", IDR_DOWNLOADS_JS);
   source->set_default_resource(IDR_DOWNLOADS_HTML);
+  source->set_use_json_js_format_v2();
 
   return source;
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // DownloadsUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 DownloadsUI::DownloadsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   DownloadManager* dlm = BrowserContext::GetDownloadManager(profile);
 
   DownloadsDOMHandler* handler = new DownloadsDOMHandler(dlm);
   web_ui->AddMessageHandler(handler);
 
   // Set up the chrome://downloads/ source.
   ChromeWebUIDataSource* source = CreateDownloadsUIHTMLSource();
-  source->set_use_json_js_format_v2();
-  ChromeURLDataManager::AddDataSource(profile, source);
+  ChromeURLDataManager::AddDataSourceImpl(profile, source);
 #if defined(ENABLE_THEMES)
   ThemeSource* theme = new ThemeSource(profile);
   ChromeURLDataManager::AddDataSource(profile, theme);
 #endif
 }
 
 // static
 base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_DOWNLOADS_FAVICON, scale_factor);
 }