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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/bookmarks/browser/bookmark_utils_unittest.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased, most Android targets locally built successfully Created 4 years, 9 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
« chrome/browser/android/omnibox/autocomplete_controller_android.cc ('K') | « components/bookmarks/browser/bookmark_utils.cc ('k') | components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc » ('j') | components/omnibox/browser/bookmark_provider.cc » ('J')
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 d9b0186b7286054f8c9ba7d6a6dfc5c801d4ce4d..f27676d8041dc392f055f221c33729b30bff869e 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -94,19 +94,19 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
query.word_phrase_query.reset(new base::string16);
// No nodes are returned for empty string.
*query.word_phrase_query = ASCIIToUTF16("");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
EXPECT_TRUE(nodes.empty());
nodes.clear();
// No nodes are returned for space-only string.
*query.word_phrase_query = ASCIIToUTF16(" ");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
EXPECT_TRUE(nodes.empty());
nodes.clear();
// Node "foo bar" and folder "foo" are returned in search results.
*query.word_phrase_query = ASCIIToUTF16("foo");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(2U, nodes.size());
EXPECT_TRUE(nodes[0] == folder1);
EXPECT_TRUE(nodes[1] == node1);
@@ -114,21 +114,21 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
// Ensure url matches return in search results.
*query.word_phrase_query = ASCIIToUTF16("cnn");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(1U, nodes.size());
EXPECT_TRUE(nodes[0] == node2);
nodes.clear();
// Ensure folder "foo" is not returned in more specific search.
*query.word_phrase_query = ASCIIToUTF16("foo bar");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(1U, nodes.size());
EXPECT_TRUE(nodes[0] == node1);
nodes.clear();
// Bookmark Bar and Other Bookmarks are not returned in search results.
*query.word_phrase_query = ASCIIToUTF16("Bookmark");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(0U, nodes.size());
nodes.clear();
}
@@ -151,19 +151,19 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
QueryFields query;
query.url.reset(new base::string16);
*query.url = ASCIIToUTF16("https://www.google.com/");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(1U, nodes.size());
EXPECT_TRUE(nodes[0] == node1);
nodes.clear();
*query.url = ASCIIToUTF16("calendar");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(0U, nodes.size());
nodes.clear();
// Empty URL should not match folders.
*query.url = ASCIIToUTF16("");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(0U, nodes.size());
nodes.clear();
}
@@ -187,19 +187,19 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
QueryFields query;
query.title.reset(new base::string16);
*query.title = ASCIIToUTF16("Google");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(1U, nodes.size());
EXPECT_TRUE(nodes[0] == node1);
nodes.clear();
*query.title = ASCIIToUTF16("Calendar");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(0U, nodes.size());
nodes.clear();
// Title should match folders.
*query.title = ASCIIToUTF16("Folder");
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(1U, nodes.size());
EXPECT_TRUE(nodes[0] == folder1);
nodes.clear();
@@ -226,7 +226,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
query.word_phrase_query.reset(new base::string16(ASCIIToUTF16("www")));
query.url.reset(new base::string16(ASCIIToUTF16("https://www.google.com/")));
query.title.reset(new base::string16(ASCIIToUTF16("Google")));
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(1U, nodes.size());
EXPECT_TRUE(nodes[0] == node1);
nodes.clear();
@@ -237,7 +237,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
// Test two fields matching.
for (size_t i = 0; i < arraysize(fields); i++) {
scoped_ptr<base::string16> original_value(fields[i]->release());
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(1U, nodes.size());
EXPECT_TRUE(nodes[0] == node1);
nodes.clear();
@@ -248,7 +248,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
for (size_t i = 0; i < arraysize(fields); i++) {
scoped_ptr<base::string16> original_value(fields[i]->release());
fields[i]->reset(new base::string16(ASCIIToUTF16("fjdkslafjkldsa")));
- GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+ GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
ASSERT_EQ(0U, nodes.size());
nodes.clear();
fields[i]->reset(original_value.release());
« chrome/browser/android/omnibox/autocomplete_controller_android.cc ('K') | « components/bookmarks/browser/bookmark_utils.cc ('k') | components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc » ('j') | components/omnibox/browser/bookmark_provider.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698