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

Unified Diff: components/bookmarks/managed/managed_bookmarks_tracker_unittest.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
Index: components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
diff --git a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
index d03502501ad31f69fdcc6e17dbda2d3642c89126..3824ea42ac9e3b5683dab631cf022ee0c3591b2c 100644
--- a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
+++ b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
@@ -4,11 +4,11 @@
#include "components/bookmarks/managed/managed_bookmarks_tracker.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/thread_task_runner_handle.h"
@@ -63,7 +63,7 @@ class ManagedBookmarksTrackerTest : public testing::Test {
BookmarkPermanentNodeList extra_nodes;
extra_nodes.push_back(managed_node);
- scoped_ptr<TestBookmarkClient> client(new TestBookmarkClient);
+ std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient);
client->SetExtraNodesToLoad(std::move(extra_nodes));
model_.reset(new BookmarkModel(std::move(client)));
@@ -171,10 +171,10 @@ class ManagedBookmarksTrackerTest : public testing::Test {
base::MessageLoop loop_;
TestingPrefServiceSimple prefs_;
- scoped_ptr<BookmarkModel> model_;
+ std::unique_ptr<BookmarkModel> model_;
MockBookmarkModelObserver observer_;
BookmarkPermanentNode* managed_node_;
- scoped_ptr<ManagedBookmarksTracker> managed_bookmarks_tracker_;
+ std::unique_ptr<ManagedBookmarksTracker> managed_bookmarks_tracker_;
};
TEST_F(ManagedBookmarksTrackerTest, Empty) {
@@ -194,7 +194,7 @@ TEST_F(ManagedBookmarksTrackerTest, LoadInitial) {
EXPECT_FALSE(managed_node()->empty());
EXPECT_TRUE(managed_node()->IsVisible());
- scoped_ptr<base::DictionaryValue> expected(CreateExpectedTree());
+ std::unique_ptr<base::DictionaryValue> expected(CreateExpectedTree());
EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
}
@@ -210,7 +210,7 @@ TEST_F(ManagedBookmarksTrackerTest, LoadInitialWithTitle) {
EXPECT_FALSE(managed_node()->empty());
EXPECT_TRUE(managed_node()->IsVisible());
- scoped_ptr<base::DictionaryValue> expected(
+ std::unique_ptr<base::DictionaryValue> expected(
CreateFolder(kExpectedFolderName, CreateTestTree()));
EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
}
@@ -236,8 +236,8 @@ TEST_F(ManagedBookmarksTrackerTest, SwapNodes) {
CreateModel(false /* is_supervised */);
// Swap the Google bookmark with the Folder.
- scoped_ptr<base::ListValue> updated(CreateTestTree());
- scoped_ptr<base::Value> removed;
+ std::unique_ptr<base::ListValue> updated(CreateTestTree());
+ std::unique_ptr<base::Value> removed;
ASSERT_TRUE(updated->Remove(0, &removed));
updated->Append(removed.release());
@@ -248,7 +248,7 @@ TEST_F(ManagedBookmarksTrackerTest, SwapNodes) {
Mock::VerifyAndClearExpectations(&observer_);
// Verify the final tree.
- scoped_ptr<base::DictionaryValue> expected(
+ std::unique_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
}
@@ -258,7 +258,7 @@ TEST_F(ManagedBookmarksTrackerTest, RemoveNode) {
CreateModel(false /* is_supervised */);
// Remove the Folder.
- scoped_ptr<base::ListValue> updated(CreateTestTree());
+ std::unique_ptr<base::ListValue> updated(CreateTestTree());
ASSERT_TRUE(updated->Remove(1, NULL));
const BookmarkNode* parent = managed_node();
@@ -267,7 +267,7 @@ TEST_F(ManagedBookmarksTrackerTest, RemoveNode) {
Mock::VerifyAndClearExpectations(&observer_);
// Verify the final tree.
- scoped_ptr<base::DictionaryValue> expected(
+ std::unique_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
}
@@ -277,7 +277,7 @@ TEST_F(ManagedBookmarksTrackerTest, CreateNewNodes) {
CreateModel(false /* is_supervised */);
// Put all the nodes inside another folder.
- scoped_ptr<base::ListValue> updated(new base::ListValue);
+ std::unique_ptr<base::ListValue> updated(new base::ListValue);
updated->Append(CreateFolder("Container", CreateTestTree()));
EXPECT_CALL(observer_, BookmarkNodeAdded(model_.get(), _, _)).Times(5);
@@ -290,7 +290,7 @@ TEST_F(ManagedBookmarksTrackerTest, CreateNewNodes) {
Mock::VerifyAndClearExpectations(&observer_);
// Verify the final tree.
- scoped_ptr<base::DictionaryValue> expected(
+ std::unique_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
}
« no previous file with comments | « components/bookmarks/managed/managed_bookmarks_tracker.cc ('k') | components/bookmarks/test/test_bookmark_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698