| 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);
|
| }
|
|
|