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

chromecast/browser/android/cast_web_contents_activity.cc

@@ -4,6 +4,7 @@
 
 #include "chromecast/browser/android/cast_web_contents_activity.h"
 
+#include "base/memory/ptr_util.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/CastWebContentsActivity_jni.h"
 
@@ -46,7 +47,8 @@ CastWebContentsActivity* CastWebContentsActivity::Get(
       web_contents->GetUserData(kCastWebContentsActivityKey));
   if (!instance) {
     instance = new CastWebContentsActivity(web_contents);
-    web_contents->SetUserData(kCastWebContentsActivityKey, instance);
+    web_contents->SetUserData(kCastWebContentsActivityKey,
+                              base::WrapUnique(instance));
   }
   return instance;
 }

chromecast/browser/android/cast_web_contents_activity.h

@@ -21,8 +21,10 @@ namespace shell {
 // Helper class to get members of the CastWebContentsActivity displaying a
 // given web_contents. This class is lazily created through the Get function and
 // will manage its own lifetime via SupportsUserData.
-class CastWebContentsActivity : base::SupportsUserData::Data {
+class CastWebContentsActivity : public base::SupportsUserData::Data {
  public:
+  ~CastWebContentsActivity() override;
+
   static bool RegisterJni(JNIEnv* env);
   static CastWebContentsActivity* Get(content::WebContents* web_contents);
 
@@ -32,7 +34,6 @@ class CastWebContentsActivity : base::SupportsUserData::Data {
 
  private:
   explicit CastWebContentsActivity(content::WebContents* web_contents);
-  ~CastWebContentsActivity() override;
 
   base::android::ScopedJavaGlobalRef<jobject> content_video_view_embedder_;