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

Unified Diff: ios/chrome/browser/favicon/favicon_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/favicon/favicon_service_factory.cc
diff --git a/ios/chrome/browser/favicon/favicon_service_factory.cc b/ios/chrome/browser/favicon/favicon_service_factory.cc
index 824baca4ddacb593b2ba7041644ca3da255ceca5..8a9381b0f8e4983d43c9d47990dd0a8c7397eb74 100644
--- a/ios/chrome/browser/favicon/favicon_service_factory.cc
+++ b/ios/chrome/browser/favicon/favicon_service_factory.cc
@@ -4,6 +4,7 @@
#include "ios/chrome/browser/favicon/favicon_service_factory.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "components/favicon/core/favicon_service.h"
#include "components/keyed_service/core/service_access_type.h"
@@ -47,12 +48,12 @@ FaviconServiceFactory::FaviconServiceFactory()
FaviconServiceFactory::~FaviconServiceFactory() {
}
-scoped_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor(
+std::unique_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor(
web::BrowserState* context) const {
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromBrowserState(context);
- return make_scoped_ptr(new favicon::FaviconService(
- make_scoped_ptr(new FaviconClientImpl(browser_state)),
+ return base::WrapUnique(new favicon::FaviconService(
+ base::WrapUnique(new FaviconClientImpl(browser_state)),
ios::HistoryServiceFactory::GetForBrowserState(
browser_state, ServiceAccessType::EXPLICIT_ACCESS)));
}
« no previous file with comments | « ios/chrome/browser/favicon/favicon_service_factory.h ('k') | ios/chrome/browser/favicon/ios_chrome_favicon_loader_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698