Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

chrome/browser/chromeos/settings/cros_settings.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 "chrome/browser/chromeos/settings/cros_settings.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 132 matching lines @@
                              const std::string& in_value) {
   DCHECK(CalledOnValidThread());
   base::StringValue value(in_value);
   Set(path, value);
 }
 
 void CrosSettings::AppendToList(const std::string& path,
                                 const base::Value* value) {
   DCHECK(CalledOnValidThread());
   const base::Value* old_value = GetPref(path);
-  scoped_ptr<base::Value> new_value(
-      old_value ? old_value->DeepCopy() : new base::ListValue());
+  std::unique_ptr<base::Value> new_value(old_value ? old_value->DeepCopy()
+                                                   : new base::ListValue());
   static_cast<base::ListValue*>(new_value.get())->Append(value->DeepCopy());
   Set(path, *new_value);
 }
 
 void CrosSettings::RemoveFromList(const std::string& path,
                                   const base::Value* value) {
   DCHECK(CalledOnValidThread());
   const base::Value* old_value = GetPref(path);
-  scoped_ptr<base::Value> new_value(
-      old_value ? old_value->DeepCopy() : new base::ListValue());
+  std::unique_ptr<base::Value> new_value(old_value ? old_value->DeepCopy()
+                                                   : new base::ListValue());
   static_cast<base::ListValue*>(new_value.get())->Remove(*value, NULL);
   Set(path, *new_value);
 }
 
 bool CrosSettings::GetBoolean(const std::string& path,
                               bool* bool_value) const {
   DCHECK(CalledOnValidThread());
   const base::Value* value = GetPref(path);
   if (value)
     return value->GetAsBoolean(bool_value);
@@ skipping 113 matching lines @@
   DCHECK(CalledOnValidThread());
   std::vector<CrosSettingsProvider*>::iterator it =
       std::find(providers_.begin(), providers_.end(), provider);
   if (it != providers_.end()) {
     providers_.erase(it);
     return true;
   }
   return false;
 }
 
-scoped_ptr<CrosSettings::ObserverSubscription>
+std::unique_ptr<CrosSettings::ObserverSubscription>
 CrosSettings::AddSettingsObserver(const std::string& path,
                                   const base::Closure& callback) {
   DCHECK(!path.empty());
   DCHECK(!callback.is_null());
   DCHECK(CalledOnValidThread());
 
   if (!GetProvider(path)) {
     NOTREACHED() << "Trying to add an observer for an unregistered setting: "
                  << path;
-    return scoped_ptr<CrosSettings::ObserverSubscription>();
+    return std::unique_ptr<CrosSettings::ObserverSubscription>();
   }
 
   // Get the callback registry associated with the path.
   base::CallbackList<void(void)>* registry = NULL;
   SettingsObserverMap::iterator observer_iterator =
       settings_observers_.find(path);
   if (observer_iterator == settings_observers_.end()) {
     registry = new base::CallbackList<void(void)>;
     settings_observers_[path] = registry;
   } else {
@@ skipping 24 matching lines @@
 
 ScopedTestCrosSettings::ScopedTestCrosSettings() {
   CrosSettings::Initialize();
 }
 
 ScopedTestCrosSettings::~ScopedTestCrosSettings() {
   CrosSettings::Shutdown();
 }
 
 }  // namespace chromeos