Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry

components/policy/core/common/policy_map.h

 // Copyright 2013 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 COMPONENTS_POLICY_CORE_COMMON_POLICY_MAP_H_
 #define COMPONENTS_POLICY_CORE_COMMON_POLICY_MAP_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 10 matching lines @@
 namespace policy {
 
 // A mapping of policy names to policy values for a given policy namespace.
 class POLICY_EXPORT PolicyMap {
  public:
   // Each policy maps to an Entry which keeps the policy value as well as other
   // relevant data about the policy.
   struct POLICY_EXPORT Entry {
     PolicyLevel level;
     PolicyScope scope;
-    base::Value* value;
-    ExternalDataFetcher* external_data_fetcher;
+    std::unique_ptr<base::Value> value;
+    std::unique_ptr<ExternalDataFetcher> external_data_fetcher;
 
     // For debugging and displaying only. Set by provider delivering the policy.
     PolicySource source;
 
     Entry();
+    ~Entry();
 
-    // Deletes all members owned by |this|.
-    void DeleteOwnedMembers();
+    Entry(Entry&&);
+    Entry& operator=(Entry&&);
 
     // Returns a copy of |this|.
-    std::unique_ptr<Entry> DeepCopy() const;
+    Entry DeepCopy() const;
 
     // Returns true if |this| has higher priority than |other|.
     bool has_higher_priority_than(const Entry& other) const;
 
     // Returns true if |this| equals |other|.
     bool Equals(const Entry& other) const;
   };
 
   typedef std::map<std::string, Entry> PolicyMapType;
   typedef PolicyMapType::const_iterator const_iterator;
 
   PolicyMap();
   virtual ~PolicyMap();
 
   // Returns a weak reference to the entry currently stored for key |policy|,
   // or NULL if not found. Ownership is retained by the PolicyMap.
   const Entry* Get(const std::string& policy) const;
 
   // Returns a weak reference to the value currently stored for key |policy|,
   // or NULL if not found. Ownership is retained by the PolicyMap.
   // This is equivalent to Get(policy)->value, when it doesn't return NULL.
   const base::Value* GetValue(const std::string& policy) const;
 
-  // Takes ownership of |value| and |external_data_fetcher|. Overwrites any
-  // existing information stored in the map for the key |policy|.
+  // Overwrites any existing information stored in the map for the key |policy|.
   void Set(const std::string& policy,
            PolicyLevel level,
            PolicyScope scope,
            PolicySource source,
-           base::Value* value,
-           ExternalDataFetcher* external_data_fetcher);
+           std::unique_ptr<base::Value> value,
+           std::unique_ptr<ExternalDataFetcher> external_data_fetcher);
+  void Set(const std::string& policy, Entry entry);
 
   // Erase the given |policy|, if it exists in this map.
   void Erase(const std::string& policy);
 
   // Swaps the internal representation of |this| with |other|.
   void Swap(PolicyMap* other);
 
   // |this| becomes a copy of |other|. Any existing policies are dropped.
   void CopyFrom(const PolicyMap& other);
 
@@ skipping 41 matching lines @@
                              const PolicyMapType::value_type& b);
 
   PolicyMapType map_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyMap);
 };
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_COMMON_POLICY_MAP_H_