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

chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc

 // 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.
 
 #include "chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 129 matching lines @@
 
   device_local_accounts_subscription_ = cros_settings_->AddSettingsObserver(
       chromeos::kAccountsPrefDeviceLocalAccounts,
       base::Bind(&CloudExternalDataPolicyObserver::RetrieveDeviceLocalAccounts,
                  base::Unretained(this)));
 }
 
 CloudExternalDataPolicyObserver::~CloudExternalDataPolicyObserver() {
   if (device_local_account_policy_service_)
     device_local_account_policy_service_->RemoveObserver(this);
-  for (DeviceLocalAccountEntryMap::iterator it =
-           device_local_account_entries_.begin();
-       it != device_local_account_entries_.end(); ++it) {
-    it->second.DeleteOwnedMembers();
-  }
   device_local_account_entries_.clear();
 }
 
 void CloudExternalDataPolicyObserver::Init() {
   RetrieveDeviceLocalAccounts();
 }
 
 void CloudExternalDataPolicyObserver::Observe(
     int type,
     const content::NotificationSource& source,
@@ skipping 49 matching lines @@
     // finds out about |user_id| and creates a |broker| for it.
     return;
   }
 
   const PolicyMap::Entry* entry =
       broker->core()->store()->policy_map().Get(policy_);
   if (!entry) {
     DeviceLocalAccountEntryMap::iterator it =
         device_local_account_entries_.find(user_id);
     if (it != device_local_account_entries_.end()) {
-      it->second.DeleteOwnedMembers();
       device_local_account_entries_.erase(it);
       HandleExternalDataPolicyUpdate(user_id, NULL);
     }
     return;
   }
 
   PolicyMap::Entry& map_entry = device_local_account_entries_[user_id];
   if (map_entry.Equals(*entry))
     return;
 
-  map_entry.DeleteOwnedMembers();
-  map_entry = *entry->DeepCopy();
+  map_entry = entry->DeepCopy();
   HandleExternalDataPolicyUpdate(user_id, entry);
 }
 
 void CloudExternalDataPolicyObserver::OnDeviceLocalAccountsChanged() {
   // No action needed here, changes to the list of device-local accounts get
   // handled via the kAccountsPrefDeviceLocalAccounts device setting observer.
 }
 
 void CloudExternalDataPolicyObserver::RetrieveDeviceLocalAccounts() {
   // Schedule a callback if device policy has not yet been verified.
@@ skipping 11 matching lines @@
            device_local_account_list.begin();
        it != device_local_account_list.end(); ++it) {
     device_local_accounts.insert(it->user_id);
   }
 
   for (DeviceLocalAccountEntryMap::iterator it =
            device_local_account_entries_.begin();
        it != device_local_account_entries_.end(); ) {
     if (!ContainsKey(device_local_accounts, it->first)) {
       const std::string user_id = it->first;
-      it->second.DeleteOwnedMembers();
       device_local_account_entries_.erase(it++);
       // When a device-local account whose external data reference was set is
       // removed, emit a notification that the external data reference has been
       // cleared.
       HandleExternalDataPolicyUpdate(user_id, NULL);
     } else {
       ++it;
     }
   }
 
@@ skipping 29 matching lines @@
 void CloudExternalDataPolicyObserver::OnExternalDataFetched(
     const std::string& user_id,
     std::unique_ptr<std::string> data) {
   FetchWeakPtrMap::iterator it = fetch_weak_ptrs_.find(user_id);
   DCHECK(it != fetch_weak_ptrs_.end());
   fetch_weak_ptrs_.erase(it);
   delegate_->OnExternalDataFetched(policy_, user_id, std::move(data));
 }
 
 }  // namespace policy