Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/prefs/value_map_pref_store.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 "base/prefs/value_map_pref_store.h"
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 11 matching lines @@
 
 void ValueMapPrefStore::RemoveObserver(PrefStore::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 bool ValueMapPrefStore::HasObservers() const {
   return observers_.might_have_observers();
 }
 
 void ValueMapPrefStore::SetValue(const std::string& key,
-                                 base::Value* value,
+                                 scoped_ptr<base::Value> value,
                                  uint32 flags) {
-  if (prefs_.SetValue(key, value))
+  if (prefs_.SetValue(key, value.Pass()))
     FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key));
 }
 
 void ValueMapPrefStore::RemoveValue(const std::string& key, uint32 flags) {
   if (prefs_.RemoveValue(key))
     FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key));
 }
 
 bool ValueMapPrefStore::GetMutableValue(const std::string& key,
                                         base::Value** value) {
   return prefs_.GetValue(key, value);
 }
 
 void ValueMapPrefStore::ReportValueChanged(const std::string& key,
                                            uint32 flags) {
   FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key));
 }
 
 void ValueMapPrefStore::SetValueSilently(const std::string& key,
-                                         base::Value* value,
+                                         scoped_ptr<base::Value> value,
                                          uint32 flags) {
-  prefs_.SetValue(key, value);
+  prefs_.SetValue(key, value.Pass());
 }
 
 ValueMapPrefStore::~ValueMapPrefStore() {}
 
 void ValueMapPrefStore::NotifyInitializationCompleted() {
   FOR_EACH_OBSERVER(Observer, observers_, OnInitializationCompleted(true));
 }