Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2108)

Unified Diff: base/prefs/pref_service.cc

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/prefs/overlay_user_pref_store_unittest.cc ('k') | base/prefs/pref_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/pref_service.cc
diff --git a/base/prefs/pref_service.cc b/base/prefs/pref_service.cc
index a9749b2ba836f6423c8d1696c038ae0b5e139cf0..c53b8966b347c02134967d6c8d932eb024d1decb 100644
--- a/base/prefs/pref_service.cc
+++ b/base/prefs/pref_service.cc
@@ -471,7 +471,8 @@ base::Value* PrefService::GetMutableUserPref(const std::string& path,
} else {
NOTREACHED();
}
- user_pref_store_->SetValueSilently(path, value, GetWriteFlags(pref));
+ user_pref_store_->SetValueSilently(path, make_scoped_ptr(value),
+ GetWriteFlags(pref));
}
return value;
}
@@ -498,7 +499,7 @@ void PrefService::SetUserPrefValue(const std::string& path,
return;
}
- user_pref_store_->SetValue(path, owned_value.release(), GetWriteFlags(pref));
+ user_pref_store_->SetValue(path, owned_value.Pass(), GetWriteFlags(pref));
}
void PrefService::UpdateCommandLinePrefStore(PrefStore* command_line_store) {
« no previous file with comments | « base/prefs/overlay_user_pref_store_unittest.cc ('k') | base/prefs/pref_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698