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

Unified Diff: ios/chrome/browser/history/history_service_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/history/history_service_factory.cc
diff --git a/ios/chrome/browser/history/history_service_factory.cc b/ios/chrome/browser/history/history_service_factory.cc
index 8748271893a2ebe6ba36349f383cb5999a9877d9..965c10a9746d83e1fa70345b220929c8433f71bc 100644
--- a/ios/chrome/browser/history/history_service_factory.cc
+++ b/ios/chrome/browser/history/history_service_factory.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "components/history/core/browser/history_database_params.h"
#include "components/history/core/browser/history_service.h"
@@ -67,13 +68,13 @@ HistoryServiceFactory::HistoryServiceFactory()
HistoryServiceFactory::~HistoryServiceFactory() {
}
-scoped_ptr<KeyedService> HistoryServiceFactory::BuildServiceInstanceFor(
+std::unique_ptr<KeyedService> HistoryServiceFactory::BuildServiceInstanceFor(
web::BrowserState* context) const {
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromBrowserState(context);
- scoped_ptr<history::HistoryService> history_service(
+ std::unique_ptr<history::HistoryService> history_service(
new history::HistoryService(
- make_scoped_ptr(new HistoryClientImpl(
+ base::WrapUnique(new HistoryClientImpl(
ios::BookmarkModelFactory::GetForBrowserState(browser_state))),
nullptr));
if (!history_service->Init(history::HistoryDatabaseParamsForPath(
« no previous file with comments | « ios/chrome/browser/history/history_service_factory.h ('k') | ios/chrome/browser/history/web_history_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698