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

Unified Diff: ios/chrome/browser/bookmarks/bookmark_model_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/bookmarks/bookmark_model_factory.cc
diff --git a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc
index 4305013324e848f5b6fa6dccedcb092343d0cea3..16ae64d5a033d0bd83ec82210b47ed4d4c4837a7 100644
--- a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_utils.h"
@@ -57,13 +58,13 @@ void BookmarkModelFactory::RegisterBrowserStatePrefs(
bookmarks::RegisterProfilePrefs(registry);
}
-scoped_ptr<KeyedService> BookmarkModelFactory::BuildServiceInstanceFor(
+std::unique_ptr<KeyedService> BookmarkModelFactory::BuildServiceInstanceFor(
web::BrowserState* context) const {
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromBrowserState(context);
- scoped_ptr<bookmarks::BookmarkModel> bookmark_model(
+ std::unique_ptr<bookmarks::BookmarkModel> bookmark_model(
new bookmarks::BookmarkModel(
- make_scoped_ptr(new BookmarkClientImpl(browser_state))));
+ base::WrapUnique(new BookmarkClientImpl(browser_state))));
bookmark_model->Load(
browser_state->GetPrefs(),
browser_state->GetStatePath(),

Powered by Google App Engine
This is Rietveld 408576698