| Index: chrome/browser/supervised_user/supervised_user_url_filter.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc
|
| index 9956e3dd4cca18d5d0dfe4b386133f7be2a3a376..254bce9e70163a23e2eabf6d42de3556f584dbf0 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_url_filter.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc
|
| @@ -142,7 +142,7 @@ void FilterBuilder::AddSiteList(
|
|
|
| scoped_ptr<SupervisedUserURLFilter::Contents> FilterBuilder::Build() {
|
| contents_->url_matcher.AddConditionSets(all_conditions_);
|
| - return contents_.Pass();
|
| + return std::move(contents_);
|
| }
|
|
|
| scoped_ptr<SupervisedUserURLFilter::Contents>
|
| @@ -449,7 +449,7 @@ void SupervisedUserURLFilter::SetBlockingTaskRunnerForTesting(
|
|
|
| void SupervisedUserURLFilter::SetContents(scoped_ptr<Contents> contents) {
|
| DCHECK(CalledOnValidThread());
|
| - contents_ = contents.Pass();
|
| + contents_ = std::move(contents);
|
| FOR_EACH_OBSERVER(Observer, observers_, OnSiteListUpdated());
|
| }
|
|
|
|
|