Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(555)

Unified Diff: components/search_engines/template_url_service.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/search_engines/template_url_service.cc
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index fac64b69d53c7558369a093867af429c615577e6..3a2bf143f42835e8b723a1c5fc2c20509e02833c 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -224,9 +224,9 @@ TemplateURLService::TemplateURLService(
rappor::RapporService* rappor_service,
const base::Closure& dsp_change_callback)
: prefs_(prefs),
- search_terms_data_(search_terms_data.Pass()),
+ search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
- client_(client.Pass()),
+ client_(std::move(client)),
google_url_tracker_(google_url_tracker),
rappor_service_(rappor_service),
dsp_change_callback_(dsp_change_callback),
@@ -550,7 +550,7 @@ void TemplateURLService::RegisterOmniboxKeyword(
scoped_ptr<TemplateURL::AssociatedExtensionInfo> info(
new TemplateURL::AssociatedExtensionInfo(
TemplateURL::OMNIBOX_API_EXTENSION, extension_id));
- AddExtensionControlledTURL(url, info.Pass());
+ AddExtensionControlledTURL(url, std::move(info));
}
TemplateURLService::TemplateURLVector TemplateURLService::GetTemplateURLs() {
@@ -1058,8 +1058,8 @@ syncer::SyncMergeResult TemplateURLService::MergeDataAndStartSyncing(
return merge_result;
}
- sync_processor_ = sync_processor.Pass();
- sync_error_factory_ = sync_error_factory.Pass();
+ sync_processor_ = std::move(sync_processor);
+ sync_error_factory_ = std::move(sync_error_factory);
// We do a lot of calls to Add/Remove/ResetTemplateURL here, so ensure we
// don't step on our own toes.
@@ -1362,7 +1362,7 @@ TemplateURLService::CreateTemplateURLFromTemplateURLAndSyncData(
}
}
- return turl.Pass();
+ return turl;
}
// static
« no previous file with comments | « components/search_engines/template_url_service.h ('k') | components/search_engines/template_url_service_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698