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

Unified Diff: chrome/browser/prefs/pref_hash_filter.cc

Issue 329173002: Make a JsonPrefStore readable while mid-interception. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
Index: chrome/browser/prefs/pref_hash_filter.cc
diff --git a/chrome/browser/prefs/pref_hash_filter.cc b/chrome/browser/prefs/pref_hash_filter.cc
index 044fe18cd572365c59886cf16ba0d4275bfe2085..b77036e8c6cc694b0a7d99fc65834aa74d34f834 100644
--- a/chrome/browser/prefs/pref_hash_filter.cc
+++ b/chrome/browser/prefs/pref_hash_filter.cc
@@ -162,7 +162,7 @@ void PrefHashFilter::FilterSerializeData(
void PrefHashFilter::FinalizeFilterOnLoad(
const PostFilterOnLoadCallback& post_filter_on_load_callback,
- scoped_ptr<base::DictionaryValue> pref_store_contents,
+ base::DictionaryValue* pref_store_contents,
bool prefs_altered) {
DCHECK(pref_store_contents);
base::TimeTicks checkpoint = base::TimeTicks::Now();
@@ -173,7 +173,7 @@ void PrefHashFilter::FinalizeFilterOnLoad(
pref_hash_store_->BeginTransaction());
for (TrackedPreferencesMap::const_iterator it = tracked_paths_.begin();
it != tracked_paths_.end(); ++it) {
- if (it->second->EnforceAndReport(pref_store_contents.get(),
+ if (it->second->EnforceAndReport(pref_store_contents,
hash_store_transaction.get())) {
did_reset = true;
prefs_altered = true;
@@ -194,5 +194,5 @@ void PrefHashFilter::FinalizeFilterOnLoad(
UMA_HISTOGRAM_TIMES("Settings.FilterOnLoadTime",
base::TimeTicks::Now() - checkpoint);
- post_filter_on_load_callback.Run(pref_store_contents.Pass(), prefs_altered);
+ post_filter_on_load_callback.Run(prefs_altered);
}

Powered by Google App Engine
This is Rietveld 408576698