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/2847013003
Cr-Commit-Position: refs/heads/master@{#468006}

chrome/browser/history/chrome_history_backend_client.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/history/chrome_history_backend_client.h"
 
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/common/channel_info.h"
 #include "components/bookmarks/browser/bookmark_model.h"
@@ -87,7 +88,7 @@ void ChromeHistoryBackendClient::OnHistoryBackendInitialized(
   if (thumbnail_database) {
     history_backend->SetUserData(
         history::AndroidProviderBackend::GetUserDataKey(),
-        new history::AndroidProviderBackend(
+        base::MakeUnique<history::AndroidProviderBackend>(
             history_dir.Append(kAndroidCacheFilename), history_database,
             thumbnail_database, this, history_backend));
   }

components/history/content/browser/web_contents_top_sites_observer.cc

@@ -5,6 +5,7 @@
 #include "components/history/content/browser/web_contents_top_sites_observer.h"
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "components/history/core/browser/top_sites.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
@@ -19,8 +20,9 @@ void WebContentsTopSitesObserver::CreateForWebContents(
     TopSites* top_sites) {
   DCHECK(web_contents);
   if (!FromWebContents(web_contents)) {
-    web_contents->SetUserData(UserDataKey(), new WebContentsTopSitesObserver(
-                                                 web_contents, top_sites));
+    web_contents->SetUserData(UserDataKey(),
+                              base::WrapUnique(new WebContentsTopSitesObserver(
+                                  web_contents, top_sites)));
   }
 }
 

components/history/content/browser/web_contents_top_sites_observer.h

@@ -19,6 +19,8 @@ class WebContentsTopSitesObserver
     : public content::WebContentsObserver,
       public content::WebContentsUserData<WebContentsTopSitesObserver> {
  public:
+  ~WebContentsTopSitesObserver() override;
+
   static void CreateForWebContents(content::WebContents* web_contents,
                                    TopSites* top_sites);
 
@@ -27,7 +29,6 @@ class WebContentsTopSitesObserver
 
   WebContentsTopSitesObserver(content::WebContents* web_contents,
                               TopSites* top_sites);
-  ~WebContentsTopSitesObserver() override;
 
   // content::WebContentsObserver implementation.
   void NavigationEntryCommitted(

components/history/core/browser/history_backend.cc

@@ -2484,10 +2484,11 @@ base::SupportsUserData::Data* HistoryBackend::GetUserData(
   return supports_user_data_helper_->GetUserData(key);
 }
 
-void HistoryBackend::SetUserData(const void* key,
-                                 base::SupportsUserData::Data* data) {
+void HistoryBackend::SetUserData(
+    const void* key,
+    std::unique_ptr<base::SupportsUserData::Data> data) {
   DCHECK(supports_user_data_helper_);
-  supports_user_data_helper_->SetUserData(key, data);
+  supports_user_data_helper_->SetUserData(key, std::move(data));
 }
 
 void HistoryBackend::ProcessDBTask(

components/history/core/browser/history_backend.h

@@ -453,10 +453,9 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
 
   // The user data allows the clients to associate data with this object.
   // Multiple user data values can be stored under different keys.
-  // This object will TAKE OWNERSHIP of the given data pointer, and will
-  // delete the object if it is changed or the object is destroyed.
   base::SupportsUserData::Data* GetUserData(const void* key) const;
-  void SetUserData(const void* key, base::SupportsUserData::Data* data);
+  void SetUserData(const void* key,
+                   std::unique_ptr<base::SupportsUserData::Data> data);
 
   // Testing -------------------------------------------------------------------
 

components/history/ios/browser/web_state_top_sites_observer.h

@@ -19,13 +19,14 @@ class WebStateTopSitesObserver
     : public web::WebStateObserver,
       public web::WebStateUserData<WebStateTopSitesObserver> {
  public:
+  ~WebStateTopSitesObserver() override;
+
   static void CreateForWebState(web::WebState* web_state, TopSites* top_sites);
 
  private:
   friend class web::WebStateUserData<WebStateTopSitesObserver>;
 
   WebStateTopSitesObserver(web::WebState* web_state, TopSites* top_sites);
-  ~WebStateTopSitesObserver() override;
 
   // web::WebStateObserver implementation.
   void NavigationItemCommitted(

components/history/ios/browser/web_state_top_sites_observer.mm

@@ -5,6 +5,7 @@
 #include "components/history/ios/browser/web_state_top_sites_observer.h"
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "components/history/core/browser/top_sites.h"
 #include "ios/web/public/load_committed_details.h"
 #include "ios/web/public/navigation_item.h"
@@ -22,8 +23,9 @@ void WebStateTopSitesObserver::CreateForWebState(web::WebState* web_state,
                                                  TopSites* top_sites) {
   DCHECK(web_state);
   if (!FromWebState(web_state)) {
-    web_state->SetUserData(UserDataKey(),
-                           new WebStateTopSitesObserver(web_state, top_sites));
+    web_state->SetUserData(
+        UserDataKey(),
+        base::WrapUnique(new WebStateTopSitesObserver(web_state, top_sites)));
   }
 }