Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/prefs/overlay_user_pref_store.cc

Index: base/prefs/overlay_user_pref_store.cc
diff --git a/base/prefs/overlay_user_pref_store.cc b/base/prefs/overlay_user_pref_store.cc
index 4c236f10dd0da84240d1e790c26099f9160756e2..d76b537ce62244c5b28294c3792873c3b37e32f5 100644
--- a/base/prefs/overlay_user_pref_store.cc
+++ b/base/prefs/overlay_user_pref_store.cc
@@ -58,31 +58,31 @@ bool OverlayUserPrefStore::GetMutableValue(const std::string& key,
     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) {