| Index: components/search_engines/default_search_manager.cc
|
| diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc
|
| index 8a96d8da68e09eacb63a18a34b5e90da19cff4bf..15b008314616e536842a26ba17defb8a8a21a334 100644
|
| --- a/components/search_engines/default_search_manager.cc
|
| +++ b/components/search_engines/default_search_manager.cc
|
| @@ -110,7 +110,8 @@ void DefaultSearchManager::RegisterProfilePrefs(
|
| void DefaultSearchManager::AddPrefValueToMap(
|
| scoped_ptr<base::DictionaryValue> value,
|
| PrefValueMap* pref_value_map) {
|
| - pref_value_map->SetValue(kDefaultSearchProviderDataPrefName, value.Pass());
|
| + pref_value_map->SetValue(kDefaultSearchProviderDataPrefName,
|
| + std::move(value));
|
| }
|
|
|
| // static
|
| @@ -406,7 +407,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
|
| void DefaultSearchManager::LoadPrepopulatedDefaultSearch() {
|
| scoped_ptr<TemplateURLData> data =
|
| TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(pref_service_);
|
| - fallback_default_search_ = data.Pass();
|
| + fallback_default_search_ = std::move(data);
|
| MergePrefsDataWithPrepopulated();
|
| }
|
|
|
|
|