Switch SupportsUserData uses to use unique_ptr.

The interface taking a raw pointer is deprecated and being removed.

BUG=690937

Review-Url: https://codereview.chromium.org/2845293004
Cr-Commit-Position: refs/heads/master@{#468226}

chrome/browser/download/chrome_download_manager_delegate.cc

@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -318,7 +319,7 @@ void ChromeDownloadManagerDelegate::DisableSafeBrowsing(DownloadItem* item) {
       item->GetUserData(&kSafeBrowsingUserDataKey));
   if (!state) {
     state = new SafeBrowsingState();
-    item->SetUserData(&kSafeBrowsingUserDataKey, state);
+    item->SetUserData(&kSafeBrowsingUserDataKey, base::WrapUnique(state));
   }
   state->CompleteDownload();
 #endif
@@ -339,7 +340,7 @@ bool ChromeDownloadManagerDelegate::IsDownloadReadyForCompletion(
                << item->DebugString(false);
       state = new SafeBrowsingState();
       state->set_callback(internal_complete_callback);
-      item->SetUserData(&kSafeBrowsingUserDataKey, state);
+      item->SetUserData(&kSafeBrowsingUserDataKey, base::WrapUnique(state));
       service->CheckClientDownload(
           item,
           base::Bind(&ChromeDownloadManagerDelegate::CheckClientDownloadDone,

chrome/browser/download/download_danger_prompt_browsertest.cc

@@ -6,6 +6,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/profiles/profile.h"
@@ -156,10 +157,10 @@ class DownloadDangerPromptTest
     EXPECT_CALL(download_, GetFileNameToReportUser()).WillRepeatedly(Return(
         base::FilePath(FILE_PATH_LITERAL("evil.exe"))));
     EXPECT_CALL(download_, GetDangerType()).WillRepeatedly(Return(danger_type));
-    DownloadProtectionService::DownloadPingToken* token_obj =
-        new DownloadProtectionService::DownloadPingToken(token);
+    auto token_obj =
+        base::MakeUnique<DownloadProtectionService::DownloadPingToken>(token);
     download_.SetUserData(DownloadProtectionService::kDownloadPingTokenKey,
-                          token_obj);
+                          std::move(token_obj));
   }
 
   void SetUpSafeBrowsingReportExpectations(

chrome/browser/download/download_history.cc

@@ -31,6 +31,7 @@
 #include <utility>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "components/history/content/browser/download_conversions.h"
@@ -77,7 +78,7 @@ class DownloadHistoryData : public base::SupportsUserData::Data {
   explicit DownloadHistoryData(content::DownloadItem* item)
       : state_(NOT_PERSISTED),
         was_restored_from_history_(false) {
-    item->SetUserData(kKey, this);
+    item->SetUserData(kKey, base::WrapUnique(this));
   }
 
   ~DownloadHistoryData() override {}

chrome/browser/download/download_item_model.cc

@@ -6,6 +6,7 @@
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
@@ -44,6 +45,8 @@ namespace {
 // DownloadItem, and the lifetime of the model is shorter than the DownloadItem.
 class DownloadItemModelData : public base::SupportsUserData::Data {
  public:
+  ~DownloadItemModelData() override {}
+
   // Get the DownloadItemModelData object for |download|. Returns NULL if
   // there's no model data.
   static const DownloadItemModelData* Get(const DownloadItem* download);
@@ -72,7 +75,6 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
 
  private:
   DownloadItemModelData();
-  ~DownloadItemModelData() override {}
 
   static const char kKey[];
 };
@@ -94,7 +96,7 @@ DownloadItemModelData* DownloadItemModelData::GetOrCreate(
   if (data == NULL) {
     data = new DownloadItemModelData();
     data->should_show_in_shelf_ = !download->IsTransient();
-    download->SetUserData(kKey, data);
+    download->SetUserData(kKey, base::WrapUnique(data));
   }
   return data;
 }

chrome/browser/download/download_path_reservation_tracker.cc

@@ -15,6 +15,7 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ -62,10 +63,9 @@ class DownloadItemObserver : public DownloadItem::Observer,
                              public base::SupportsUserData::Data {
  public:
   explicit DownloadItemObserver(DownloadItem* download_item);
-
- private:
   ~DownloadItemObserver() override;
 
+ private:
   // DownloadItem::Observer
   void OnDownloadUpdated(DownloadItem* download) override;
   void OnDownloadDestroyed(DownloadItem* download) override;
@@ -338,7 +338,7 @@ DownloadItemObserver::DownloadItemObserver(DownloadItem* download_item)
       last_target_path_(download_item->GetTargetFilePath()) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   download_item_->AddObserver(this);
-  download_item_->SetUserData(&kUserDataKey, this);
+  download_item_->SetUserData(&kUserDataKey, base::WrapUnique(this));
 }
 
 DownloadItemObserver::~DownloadItemObserver() {

chrome/browser/download/download_status_updater.cc

@@ -39,7 +39,7 @@ class WasInProgressData : public base::SupportsUserData::Data {
   }
 
   explicit WasInProgressData(content::DownloadItem* item) {
-    item->SetUserData(kKey, this);
+    item->SetUserData(kKey, base::WrapUnique(this));
   }
 
  private:

chrome/browser/download/download_status_updater_mac.mm

@@ -7,6 +7,7 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/supports_user_data.h"
 #import "chrome/browser/ui/cocoa/dock_icon.h"
@@ -161,8 +162,9 @@ void CreateNSProgress(content::DownloadItem* download) {
 
   [progress publish];
 
-  download->SetUserData(&kCrNSProgressUserDataKey,
-                        new CrNSProgressUserData(progress, destination_path));
+  download->SetUserData(
+      &kCrNSProgressUserDataKey,
+      base::MakeUnique<CrNSProgressUserData>(progress, destination_path));
 }
 
 void UpdateNSProgress(content::DownloadItem* download,