| Index: base/supports_user_data.h
 | 
| diff --git a/base/supports_user_data.h b/base/supports_user_data.h
 | 
| index ab40c1b3c47bc143e965b083a763c88cdf2a52c5..a9f1c93204866761292625c41a5007ae4503e1f4 100644
 | 
| --- a/base/supports_user_data.h
 | 
| +++ b/base/supports_user_data.h
 | 
| @@ -6,11 +6,11 @@
 | 
|  #define BASE_SUPPORTS_USER_DATA_H_
 | 
|  
 | 
|  #include <map>
 | 
| +#include <memory>
 | 
|  
 | 
|  #include "base/base_export.h"
 | 
|  #include "base/macros.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
| -#include "base/memory/scoped_ptr.h"
 | 
|  #include "base/threading/thread_checker.h"
 | 
|  
 | 
|  namespace base {
 | 
| @@ -47,7 +47,7 @@ class BASE_EXPORT SupportsUserData {
 | 
|    virtual ~SupportsUserData();
 | 
|  
 | 
|   private:
 | 
| -  using DataMap = std::map<const void*, scoped_ptr<Data>>;
 | 
| +  using DataMap = std::map<const void*, std::unique_ptr<Data>>;
 | 
|  
 | 
|    // Externally-defined data accessible by key.
 | 
|    DataMap user_data_;
 | 
| 
 |