Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/prefs/overlay_user_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/overlay_user_pref_store.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 OverlayUserPrefStore::OverlayUserPrefStore(
@@ skipping 40 matching lines @@
 
   if (overlay_.GetValue(key, result))
     return true;
 
   // Try to create copy of underlay if the overlay does not contain a value.
   base::Value* underlay_value = NULL;
   if (!underlay_->GetMutableValue(GetUnderlayKey(key), &underlay_value))
     return false;
 
   *result = underlay_value->DeepCopy();
-  overlay_.SetValue(key, *result);
+  overlay_.SetValue(key, make_scoped_ptr(*result));
   return true;
 }
 
 void OverlayUserPrefStore::SetValue(const std::string& key,
-                                    base::Value* value,
+                                    scoped_ptr<base::Value> value,
                                     uint32 flags) {
   if (!ShallBeStoredInOverlay(key)) {
-    underlay_->SetValue(GetUnderlayKey(key), value, flags);
+    underlay_->SetValue(GetUnderlayKey(key), value.Pass(), flags);
     return;
   }
 
-  if (overlay_.SetValue(key, value))
+  if (overlay_.SetValue(key, value.Pass()))
     ReportValueChanged(key, flags);
 }
 
 void OverlayUserPrefStore::SetValueSilently(const std::string& key,
-                                            base::Value* value,
+                                            scoped_ptr<base::Value> value,
                                             uint32 flags) {
   if (!ShallBeStoredInOverlay(key)) {
-    underlay_->SetValueSilently(GetUnderlayKey(key), value, flags);
+    underlay_->SetValueSilently(GetUnderlayKey(key), value.Pass(), flags);
     return;
   }
 
-  overlay_.SetValue(key, value);
+  overlay_.SetValue(key, value.Pass());
 }
 
 void OverlayUserPrefStore::RemoveValue(const std::string& key, uint32 flags) {
   if (!ShallBeStoredInOverlay(key)) {
     underlay_->RemoveValue(GetUnderlayKey(key), flags);
     return;
   }
 
   if (overlay_.RemoveValue(key))
     ReportValueChanged(key, flags);
@@ skipping 79 matching lines @@
   NamesMap::const_iterator i =
       overlay_to_underlay_names_map_.find(overlay_key);
   return i != overlay_to_underlay_names_map_.end() ? i->second : overlay_key;
 }
 
 bool OverlayUserPrefStore::ShallBeStoredInOverlay(
     const std::string& key) const {
   return overlay_to_underlay_names_map_.find(key) !=
       overlay_to_underlay_names_map_.end();
 }