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

Unified Diff: ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 months 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: ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc
diff --git a/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc b/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc
index 867ae8a76ac86153cc75d555bfe4c6237e74b344..ed876b253b337bd6661e029c4a73b3e78ff71aaf 100644
--- a/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc
+++ b/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc
@@ -22,7 +22,8 @@ namespace ios {
namespace {
-scoped_ptr<KeyedService> BuildInMemoryURLIndex(web::BrowserState* context) {
+std::unique_ptr<KeyedService> BuildInMemoryURLIndex(
+ web::BrowserState* context) {
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromBrowserState(context);
@@ -30,7 +31,7 @@ scoped_ptr<KeyedService> BuildInMemoryURLIndex(web::BrowserState* context) {
schemes_to_whilelist.insert(kChromeUIScheme);
// Do not force creation of the HistoryService if saving history is disabled.
- scoped_ptr<InMemoryURLIndex> in_memory_url_index(new InMemoryURLIndex(
+ std::unique_ptr<InMemoryURLIndex> in_memory_url_index(new InMemoryURLIndex(
ios::BookmarkModelFactory::GetForBrowserState(browser_state),
ios::HistoryServiceFactory::GetForBrowserState(
browser_state, ServiceAccessType::IMPLICIT_ACCESS),
@@ -72,7 +73,7 @@ InMemoryURLIndexFactory::GetDefaultFactory() {
return &BuildInMemoryURLIndex;
}
-scoped_ptr<KeyedService> InMemoryURLIndexFactory::BuildServiceInstanceFor(
+std::unique_ptr<KeyedService> InMemoryURLIndexFactory::BuildServiceInstanceFor(
web::BrowserState* context) const {
return BuildInMemoryURLIndex(context);
}

Powered by Google App Engine
This is Rietveld 408576698