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

Unified Diff: components/bookmarks/test/test_bookmark_client.cc

Issue 1906973002: Convert //components/bookmarks from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « components/bookmarks/test/test_bookmark_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks/test/test_bookmark_client.cc
diff --git a/components/bookmarks/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc
index 1b22ab25767ec5bed988c8e9b30c50f0d996d00b..470f1c9927784cd33b4fdfeb0144682638120304 100644
--- a/components/bookmarks/test/test_bookmark_client.cc
+++ b/components/bookmarks/test/test_bookmark_client.cc
@@ -5,11 +5,13 @@
#include "components/bookmarks/test/test_bookmark_client.h"
#include <stddef.h>
+
#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_node.h"
#include "components/bookmarks/browser/bookmark_storage.h"
@@ -21,16 +23,17 @@ TestBookmarkClient::TestBookmarkClient() {}
TestBookmarkClient::~TestBookmarkClient() {}
// static
-scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() {
- return CreateModelWithClient(make_scoped_ptr(new TestBookmarkClient));
+std::unique_ptr<BookmarkModel> TestBookmarkClient::CreateModel() {
+ return CreateModelWithClient(base::WrapUnique(new TestBookmarkClient));
}
// static
-scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModelWithClient(
- scoped_ptr<BookmarkClient> client) {
- scoped_ptr<BookmarkModel> bookmark_model(
+std::unique_ptr<BookmarkModel> TestBookmarkClient::CreateModelWithClient(
+ std::unique_ptr<BookmarkClient> client) {
+ std::unique_ptr<BookmarkModel> bookmark_model(
new BookmarkModel(std::move(client)));
- scoped_ptr<BookmarkLoadDetails> details = bookmark_model->CreateLoadDetails();
+ std::unique_ptr<BookmarkLoadDetails> details =
+ bookmark_model->CreateLoadDetails();
details->LoadExtraNodes();
bookmark_model->DoneLoading(std::move(details));
return bookmark_model;
« no previous file with comments | « components/bookmarks/test/test_bookmark_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698