Update SupportsUserData API to accept std::unique_ptr<>.

base/supports_user_data.h

 // 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.
 
 #ifndef BASE_SUPPORTS_USER_DATA_H_
 #define BASE_SUPPORTS_USER_DATA_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 19 matching lines @@
   // class to any class with a virtual destructor.
   class BASE_EXPORT Data {
    public:
     virtual ~Data() = default;
   };
 
   // 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.
+  // TODO: remove the raw ptr version of SetUserData once everything uses
+  // the unique_ptr version, see crbug.com/690937.
   Data* GetUserData(const void* key) const;
   void SetUserData(const void* key, Data* data);
+  void SetUserData(const void* key, std::unique_ptr<Data> data);
   void RemoveUserData(const void* key);
 
   // SupportsUserData is not thread-safe, and on debug build will assert it is
   // only used on one execution sequence. Calling this method allows the caller
   // to hand the SupportsUserData instance across execution sequences. Use only
   // if you are taking full control of the synchronization of that hand over.
   void DetachFromSequence();
 
  protected:
   virtual ~SupportsUserData();
@@ skipping 25 matching lines @@
 
  private:
   scoped_refptr<T> object_;
 
   DISALLOW_COPY_AND_ASSIGN(UserDataAdapter);
 };
 
 }  // namespace base
 
 #endif  // BASE_SUPPORTS_USER_DATA_H_