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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/bookmarks/browser/bookmark_utils_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
« no previous file with comments | « components/bookmarks/browser/bookmark_utils.h ('k') | components/bookmarks/managed/managed_bookmark_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks/browser/bookmark_utils_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index f27676d8041dc392f055f221c33729b30bff869e..fd151d453452659496ee1224a74e56099247e275 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -78,7 +78,7 @@ class BookmarkUtilsTest : public testing::Test,
};
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("foo bar"),
@@ -135,7 +135,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
// Check exact matching against a URL query.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("Google"),
@@ -170,7 +170,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
// Check exact matching against a title query.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("Google"),
@@ -207,7 +207,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
// Check matching against a query with multiple predicates.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("Google"),
@@ -231,12 +231,12 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
EXPECT_TRUE(nodes[0] == node1);
nodes.clear();
- scoped_ptr<base::string16>* fields[] = {
- &query.word_phrase_query, &query.url, &query.title };
+ std::unique_ptr<base::string16>* fields[] = {&query.word_phrase_query,
+ &query.url, &query.title};
// Test two fields matching.
for (size_t i = 0; i < arraysize(fields); i++) {
- scoped_ptr<base::string16> original_value(fields[i]->release());
+ std::unique_ptr<base::string16> original_value(fields[i]->release());
GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(1U, nodes.size());
EXPECT_TRUE(nodes[0] == node1);
@@ -246,7 +246,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
// Test two fields matching with one non-matching field.
for (size_t i = 0; i < arraysize(fields); i++) {
- scoped_ptr<base::string16> original_value(fields[i]->release());
+ std::unique_ptr<base::string16> original_value(fields[i]->release());
fields[i]->reset(new base::string16(ASCIIToUTF16("fjdkslafjkldsa")));
GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(0U, nodes.size());
@@ -258,7 +258,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
// Copy and paste is not yet supported on iOS. http://crbug.com/228147
#if !defined(OS_IOS)
TEST_F(BookmarkUtilsTest, PasteBookmarkFromURL) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const base::string16 url_text = ASCIIToUTF16("http://www.google.com/");
const BookmarkNode* new_folder = model->AddFolder(
model->bookmark_bar_node(), 0, ASCIIToUTF16("New_Folder"));
@@ -287,7 +287,7 @@ TEST_F(BookmarkUtilsTest, PasteBookmarkFromURL) {
}
TEST_F(BookmarkUtilsTest, CopyPaste) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("foo bar"),
@@ -315,7 +315,7 @@ TEST_F(BookmarkUtilsTest, CopyPaste) {
// Test for updating title such that url and title pair are unique among the
// children of parent.
TEST_F(BookmarkUtilsTest, MakeTitleUnique) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const base::string16 url_text = ASCIIToUTF16("http://www.google.com/");
const base::string16 title_text = ASCIIToUTF16("foobar");
const BookmarkNode* bookmark_bar_node = model->bookmark_bar_node();
@@ -348,7 +348,7 @@ TEST_F(BookmarkUtilsTest, MakeTitleUnique) {
}
TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("foo bar"),
@@ -390,7 +390,7 @@ TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
#define MAYBE_CutToClipboard CutToClipboard
#endif
TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
model->AddObserver(this);
base::string16 title(ASCIIToUTF16("foo"));
@@ -416,13 +416,13 @@ TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
// Load a model with an extra node that is not editable.
- scoped_ptr<TestBookmarkClient> client(new TestBookmarkClient());
+ std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient());
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
extra_nodes.push_back(extra_node);
client->SetExtraNodesToLoad(std::move(extra_nodes));
- scoped_ptr<BookmarkModel> model(
+ std::unique_ptr<BookmarkModel> model(
TestBookmarkClient::CreateModelWithClient(std::move(client)));
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
@@ -445,7 +445,7 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
#endif // !defined(OS_IOS)
TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
// This tests the case where selection contains one item and that item is a
// folder.
std::vector<const BookmarkNode*> nodes;
@@ -486,7 +486,7 @@ TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
// Verifies that meta info is copied when nodes are cloned.
TEST_F(BookmarkUtilsTest, CloneMetaInfo) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
// Add a node containing meta info.
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
@@ -519,7 +519,7 @@ TEST_F(BookmarkUtilsTest, CloneMetaInfo) {
// Verifies that meta info fields in the non cloned set are not copied when
// cloning a bookmark.
TEST_F(BookmarkUtilsTest, CloneBookmarkResetsNonClonedKey) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
model->AddNonClonedKey("foo");
const BookmarkNode* parent = model->other_node();
const BookmarkNode* node = model->AddURL(
@@ -544,7 +544,7 @@ TEST_F(BookmarkUtilsTest, CloneBookmarkResetsNonClonedKey) {
// Verifies that meta info fields in the non cloned set are not copied when
// cloning a folder.
TEST_F(BookmarkUtilsTest, CloneFolderResetsNonClonedKey) {
- scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
model->AddNonClonedKey("foo");
const BookmarkNode* parent = model->other_node();
const BookmarkNode* node = model->AddFolder(parent, 0, ASCIIToUTF16("title"));
@@ -567,13 +567,13 @@ TEST_F(BookmarkUtilsTest, CloneFolderResetsNonClonedKey) {
TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
// Load a model with an extra node that is not editable.
- scoped_ptr<TestBookmarkClient> client(new TestBookmarkClient());
+ std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient());
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
extra_nodes.push_back(extra_node);
client->SetExtraNodesToLoad(std::move(extra_nodes));
- scoped_ptr<BookmarkModel> model(
+ std::unique_ptr<BookmarkModel> model(
TestBookmarkClient::CreateModelWithClient(std::move(client)));
EXPECT_TRUE(model->bookmark_bar_node()->empty());
EXPECT_TRUE(model->other_node()->empty());
« no previous file with comments | « components/bookmarks/browser/bookmark_utils.h ('k') | components/bookmarks/managed/managed_bookmark_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698