Switch to the unique_ptr version of content::URLDataSource::Add().

Change a bunch of WebUIs to use the non-deprecated version.

Change-Id: I1d918500b59ea92f642fda08bdfb020a56acaf26
Reviewed-on: https://chromium-review.googlesource.com/1194979Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587198}

chrome/browser/dom_distiller/profile_utils.cc

@@ -39,17 +39,17 @@ void RegisterViewerSource(Profile* profile) {
   std::unique_ptr<DistillerUIHandle> ui_handle;
 
 #if defined(OS_ANDROID)
-  ui_handle.reset(new dom_distiller::android::DistillerUIHandleAndroid());
+  ui_handle =
+      std::make_unique<dom_distiller::android::DistillerUIHandleAndroid>();
 #endif  // defined(OS_ANDROID)
 
   // Set the JavaScript world ID.
-  if (!DistillerJavaScriptWorldIdIsSet()) {
+  if (!DistillerJavaScriptWorldIdIsSet())
     SetDistillerJavaScriptWorldId(ISOLATED_WORLD_ID_CHROME_INTERNAL);
-  }
 
   content::URLDataSource::Add(
-      profile, new DomDistillerViewerSource(lazy_service, kDomDistillerScheme,
-                                            std::move(ui_handle)));
+      profile, std::make_unique<DomDistillerViewerSource>(
+                   lazy_service, kDomDistillerScheme, std::move(ui_handle)));
 }
 
 }  // namespace dom_distiller

chrome/browser/profiles/profile_impl.cc

@@ -743,7 +743,8 @@ void ProfileImpl::DoFinalInit() {
   signin_ui_util::InitializePrefsForProfile(this);
 #endif
 
-  content::URLDataSource::Add(this, new PrefsInternalsSource(this));
+  content::URLDataSource::Add(this,
+                              std::make_unique<PrefsInternalsSource>(this));
 
   ScheduleUpdateCTPolicy();
 }

chrome/browser/ui/webui/app_launcher_page_ui.cc

@@ -55,9 +55,9 @@ AppLauncherPageUI::AppLauncherPageUI(content::WebUI* web_ui)
   // earlier.
   web_ui->AddMessageHandler(std::make_unique<ThemeHandler>());
 
-  std::unique_ptr<HTMLSource> html_source(
-      new HTMLSource(GetProfile()->GetOriginalProfile()));
-  content::URLDataSource::Add(GetProfile(), html_source.release());
+  content::URLDataSource::Add(
+      GetProfile(),
+      std::make_unique<HTMLSource>(GetProfile()->GetOriginalProfile()));
 }
 
 AppLauncherPageUI::~AppLauncherPageUI() {

chrome/browser/ui/webui/browsing_history_handler.cc

@@ -245,7 +245,8 @@ void BrowsingHistoryHandler::RegisterMessages() {
       this, local_history, sync_service);
 
   // Create our favicon data source.
-  content::URLDataSource::Add(profile, new FaviconSource(profile));
+  content::URLDataSource::Add(profile,
+                              std::make_unique<FaviconSource>(profile));
 
   web_ui()->RegisterMessageCallback(
       "queryHistory",

chrome/browser/ui/webui/interstitials/interstitial_ui.cc

@@ -408,7 +408,8 @@ CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
 InterstitialUI::InterstitialUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
-  content::URLDataSource::Add(profile, new InterstitialHTMLSource());
+  content::URLDataSource::Add(profile,
+                              std::make_unique<InterstitialHTMLSource>());
 }
 
 InterstitialUI::~InterstitialUI() {

chrome/browser/ui/webui/md_downloads/md_downloads_ui.cc

@@ -157,8 +157,7 @@ MdDownloadsUI::MdDownloadsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   // Set up the chrome://downloads/ source.
   content::WebUIDataSource* source = CreateDownloadsUIHTMLSource(profile);
   content::WebUIDataSource::Add(profile, source);
-  ThemeSource* theme = new ThemeSource(profile);
-  content::URLDataSource::Add(profile, theme);
+  content::URLDataSource::Add(profile, std::make_unique<ThemeSource>(profile));
 }
 
 // static

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

@@ -58,8 +58,8 @@ NewTabUI::NewTabUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
     web_ui->AddMessageHandler(std::make_unique<ThemeHandler>());
 
   // content::URLDataSource assumes the ownership of the html source.
-  content::URLDataSource::Add(
-      profile, new NewTabHTMLSource(profile->GetOriginalProfile()));
+  content::URLDataSource::Add(profile, std::make_unique<NewTabHTMLSource>(
+                                           profile->GetOriginalProfile()));
 
   pref_change_registrar_.Init(profile->GetPrefs());
   pref_change_registrar_.Add(bookmarks::prefs::kShowBookmarkBar,

chrome/browser/ui/webui/print_preview/print_preview_ui.cc

@@ -597,7 +597,7 @@ PrintPreviewUI::PrintPreviewUI(content::WebUI* web_ui)
   }
 
   // Set up the chrome://theme/ source.
-  content::URLDataSource::Add(profile, new ThemeSource(profile));
+  content::URLDataSource::Add(profile, std::make_unique<ThemeSource>(profile));
 
   g_print_preview_request_id_map.Get().Set(id_, -1);
 }

chrome/browser/ui/webui/signin/md_user_manager_ui.cc

@@ -45,8 +45,7 @@ MDUserManagerUI::MDUserManagerUI(content::WebUI* web_ui)
   content::WebUIDataSource::Add(profile, CreateUIDataSource(localized_strings));
 
   // Set up the chrome://theme/ source
-  ThemeSource* theme = new ThemeSource(profile);
-  content::URLDataSource::Add(profile, theme);
+  content::URLDataSource::Add(profile, std::make_unique<ThemeSource>(profile));
 }
 
 MDUserManagerUI::~MDUserManagerUI() {}

chrome/browser/ui/webui/theme_handler.cc

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/theme_handler.h"
 
+#include <memory>
+
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ -49,8 +51,7 @@ void ThemeHandler::Observe(int type,
 
 void ThemeHandler::InitializeCSSCaches() {
   Profile* profile = GetProfile();
-  ThemeSource* theme = new ThemeSource(profile);
-  content::URLDataSource::Add(profile, theme);
+  content::URLDataSource::Add(profile, std::make_unique<ThemeSource>(profile));
 }
 
 Profile* ThemeHandler::GetProfile() const {

chrome/browser/ui/webui/version_ui.cc

@@ -171,8 +171,7 @@ VersionUI::VersionUI(content::WebUI* web_ui)
 
 #if !defined(OS_ANDROID)
   // Set up the chrome://theme/ source.
-  ThemeSource* theme = new ThemeSource(profile);
-  content::URLDataSource::Add(profile, theme);
+  content::URLDataSource::Add(profile, std::make_unique<ThemeSource>(profile));
 #endif
 
   WebUIDataSource::Add(profile, CreateVersionUIDataSource());