Convert //components/prefs from scoped_ptr to std::unique_ptr

components/prefs/pref_service.cc

 // 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.
 
 #include "components/prefs/pref_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/value_conversions.h"
 #include "build/build_config.h"
 #include "components/prefs/default_pref_store.h"
 #include "components/prefs/pref_notifier_impl.h"
@@ skipping 161 matching lines @@
   bool rv = base::GetValueAsFilePath(*value, &result);
   DCHECK(rv);
   return result;
 }
 
 bool PrefService::HasPrefPath(const std::string& path) const {
   const Preference* pref = FindPreference(path);
   return pref && !pref->IsDefaultValue();
 }
 
-scoped_ptr<base::DictionaryValue> PrefService::GetPreferenceValues() const {
+std::unique_ptr<base::DictionaryValue> PrefService::GetPreferenceValues()
+    const {
   DCHECK(CalledOnValidThread());
-  scoped_ptr<base::DictionaryValue> out(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> out(new base::DictionaryValue);
   for (const auto& it : *pref_registry_) {
     out->Set(it.first, GetPreferenceValue(it.first)->CreateDeepCopy());
   }
   return out;
 }
 
-scoped_ptr<base::DictionaryValue> PrefService::GetPreferenceValuesOmitDefaults()
-    const {
+std::unique_ptr<base::DictionaryValue>
+PrefService::GetPreferenceValuesOmitDefaults() const {
   DCHECK(CalledOnValidThread());
-  scoped_ptr<base::DictionaryValue> out(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> out(new base::DictionaryValue);
   for (const auto& it : *pref_registry_) {
     const Preference* pref = FindPreference(it.first);
     if (pref->IsDefaultValue())
       continue;
     out->Set(it.first, pref->GetValue()->CreateDeepCopy());
   }
   return out;
 }
 
-scoped_ptr<base::DictionaryValue>
+std::unique_ptr<base::DictionaryValue>
 PrefService::GetPreferenceValuesWithoutPathExpansion() const {
   DCHECK(CalledOnValidThread());
-  scoped_ptr<base::DictionaryValue> out(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> out(new base::DictionaryValue);
   for (const auto& it : *pref_registry_) {
     const base::Value* value = GetPreferenceValue(it.first);
     DCHECK(value);
     out->SetWithoutPathExpansion(it.first, value->CreateDeepCopy());
   }
   return out;
 }
 
 const PrefService::Preference* PrefService::FindPreference(
     const std::string& pref_name) const {
@@ skipping 238 matching lines @@
   base::Value* value = NULL;
   if (!user_pref_store_->GetMutableValue(path, &value) ||
       !value->IsType(type)) {
     if (type == base::Value::TYPE_DICTIONARY) {
       value = new base::DictionaryValue;
     } else if (type == base::Value::TYPE_LIST) {
       value = new base::ListValue;
     } else {
       NOTREACHED();
     }
-    user_pref_store_->SetValueSilently(path, make_scoped_ptr(value),
+    user_pref_store_->SetValueSilently(path, base::WrapUnique(value),
                                        GetWriteFlags(pref));
   }
   return value;
 }
 
 void PrefService::ReportUserPrefChanged(const std::string& key) {
   DCHECK(CalledOnValidThread());
   user_pref_store_->ReportValueChanged(key, GetWriteFlags(FindPreference(key)));
 }
 
 void PrefService::SetUserPrefValue(const std::string& path,
                                    base::Value* new_value) {
-  scoped_ptr<base::Value> owned_value(new_value);
+  std::unique_ptr<base::Value> owned_value(new_value);
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     NOTREACHED() << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->GetType() != new_value->GetType()) {
     NOTREACHED() << "Trying to set pref " << path
                  << " of type " << pref->GetType()
@@ skipping 108 matching lines @@
       DCHECK(found_value->IsType(default_type));
       return found_value;
     } else {
       // Every registered preference has at least a default value.
       NOTREACHED() << "no valid value found for registered pref " << path;
     }
   }
 
   return NULL;
 }