| Index: components/user_prefs/tracked/interceptable_pref_filter.cc
|
| diff --git a/chrome/browser/prefs/tracked/interceptable_pref_filter.cc b/components/user_prefs/tracked/interceptable_pref_filter.cc
|
| similarity index 82%
|
| rename from chrome/browser/prefs/tracked/interceptable_pref_filter.cc
|
| rename to components/user_prefs/tracked/interceptable_pref_filter.cc
|
| index adc61163296ccc7ba2a75146cf7708955e971148..180ee7e993c78e3bd9e722f5a6211b1bdfff7c71 100644
|
| --- a/chrome/browser/prefs/tracked/interceptable_pref_filter.cc
|
| +++ b/components/user_prefs/tracked/interceptable_pref_filter.cc
|
| @@ -2,20 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/prefs/tracked/interceptable_pref_filter.h"
|
| +#include "components/user_prefs/tracked/interceptable_pref_filter.h"
|
|
|
| #include "base/bind.h"
|
|
|
| -InterceptablePrefFilter::InterceptablePrefFilter() {}
|
| -InterceptablePrefFilter::~InterceptablePrefFilter() {}
|
| +InterceptablePrefFilter::InterceptablePrefFilter() {
|
| +}
|
| +InterceptablePrefFilter::~InterceptablePrefFilter() {
|
| +}
|
|
|
| void InterceptablePrefFilter::FilterOnLoad(
|
| const PostFilterOnLoadCallback& post_filter_on_load_callback,
|
| scoped_ptr<base::DictionaryValue> pref_store_contents) {
|
| if (filter_on_load_interceptor_.is_null()) {
|
| FinalizeFilterOnLoad(post_filter_on_load_callback,
|
| - pref_store_contents.Pass(),
|
| - false);
|
| + pref_store_contents.Pass(), false);
|
| } else {
|
| // Note, in practice (in the implementation as it was in May 2014) it would
|
| // be okay to pass an unretained |this| pointer below, but in order to avoid
|
| @@ -23,8 +24,7 @@ void InterceptablePrefFilter::FilterOnLoad(
|
| // model as it happens to currently be: make the relationship simpler by
|
| // weakly binding the FinalizeFilterOnLoadCallback below to |this|.
|
| const FinalizeFilterOnLoadCallback finalize_filter_on_load(
|
| - base::Bind(&InterceptablePrefFilter::FinalizeFilterOnLoad,
|
| - AsWeakPtr(),
|
| + base::Bind(&InterceptablePrefFilter::FinalizeFilterOnLoad, AsWeakPtr(),
|
| post_filter_on_load_callback));
|
| filter_on_load_interceptor_.Run(finalize_filter_on_load,
|
| pref_store_contents.Pass());
|
|
|