| Index: chrome/browser/content_settings/content_settings_supervised_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_supervised_provider.cc b/chrome/browser/content_settings/content_settings_supervised_provider.cc
|
| index af3c72183296379fe39bcf2ebb80ab003d57842d..6a199a5f8a03bf4708702ac3e2f16287dbbbabe5 100644
|
| --- a/chrome/browser/content_settings/content_settings_supervised_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_supervised_provider.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/content_settings/content_settings_supervised_provider.h"
|
|
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "chrome/browser/supervised_user/supervised_user_constants.h"
|
| @@ -57,7 +58,7 @@ scoped_ptr<RuleIterator> SupervisedProvider::GetRuleIterator(
|
| bool incognito) const {
|
| scoped_ptr<base::AutoLock> auto_lock(new base::AutoLock(lock_));
|
| return value_map_.GetRuleIterator(content_type, resource_identifier,
|
| - auto_lock.Pass());
|
| + std::move(auto_lock));
|
| }
|
|
|
| void SupervisedProvider::OnSupervisedSettingsAvailable(
|
|
|