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

Unified Diff: ios/chrome/browser/history/web_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
« no previous file with comments | « ios/chrome/browser/history/web_history_service_factory.h ('k') | ios/chrome/browser/infobars/infobar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/history/web_history_service_factory.cc
diff --git a/ios/chrome/browser/history/web_history_service_factory.cc b/ios/chrome/browser/history/web_history_service_factory.cc
index 9211fc6b3e74c2e135facf58806461e72da3ba01..9436a2cb1425348a8be143349a15a269b5af184e 100644
--- a/ios/chrome/browser/history/web_history_service_factory.cc
+++ b/ios/chrome/browser/history/web_history_service_factory.cc
@@ -4,6 +4,7 @@
#include "ios/chrome/browser/history/web_history_service_factory.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "components/browser_sync/browser/profile_sync_service.h"
#include "components/history/core/browser/web_history_service.h"
@@ -62,11 +63,11 @@ WebHistoryServiceFactory::WebHistoryServiceFactory()
WebHistoryServiceFactory::~WebHistoryServiceFactory() {
}
-scoped_ptr<KeyedService> WebHistoryServiceFactory::BuildServiceInstanceFor(
+std::unique_ptr<KeyedService> WebHistoryServiceFactory::BuildServiceInstanceFor(
web::BrowserState* context) const {
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromBrowserState(context);
- return make_scoped_ptr(new history::WebHistoryService(
+ return base::WrapUnique(new history::WebHistoryService(
OAuth2TokenServiceFactory::GetForBrowserState(browser_state),
ios::SigninManagerFactory::GetForBrowserState(browser_state),
browser_state->GetRequestContext()));
« no previous file with comments | « ios/chrome/browser/history/web_history_service_factory.h ('k') | ios/chrome/browser/infobars/infobar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698